summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2002-06-11 13:14:08 +0000
committerMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2002-06-11 13:14:08 +0000
commit741c91b0e77b38d46247d18910b6bb42cf804232 (patch)
tree5a62a83a19e30c6b3cae384c7c0c6e9044f99fde /multimedia
parentUpdate to 0.3. (diff)
Update to 0.90.0.5
Approved by: maintainer
Notes
Notes: svn path=/head/; revision=61109
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer/Makefile7
-rw-r--r--multimedia/mplayer/distinfo2
-rw-r--r--multimedia/mplayer/files/patch-ad22
-rw-r--r--multimedia/mplayer/files/patch-ae20
-rw-r--r--multimedia/mplayer/pkg-plist1
-rw-r--r--multimedia/mplayerxp/Makefile7
-rw-r--r--multimedia/mplayerxp/distinfo2
-rw-r--r--multimedia/mplayerxp/files/patch-ad22
-rw-r--r--multimedia/mplayerxp/files/patch-ae20
-rw-r--r--multimedia/mplayerxp/pkg-plist1
10 files changed, 54 insertions, 50 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 43a68760e998..c3de6f8f2b40 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -6,16 +6,17 @@
#
PORTNAME= mplayer
-PORTVERSION= 0.90.0.4
-PORTREVISION= 1
+PORTVERSION= 0.90.0.5
CATEGORIES= graphics
MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \
http://www.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
+ http://ftp.lug.udel.edu/MPlayer/releases/ \
ftp://ftp.mplayerhq.hu/MPlayer/releases/ \
ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
+ ftp://ftp.lug.udel.edu/MPlayer/releases/ \
http://www.rrr.de/~riggs/mplayer/
-DISTNAME= MPlayer-0.90pre4
+DISTNAME= MPlayer-0.90pre5
MAINTAINER= riggs@rrr.de
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index dad620f9f409..34f07d2846f8 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.90pre4.tar.bz2) = 987436bd5f94a718d4813a6c69f07625
+MD5 (MPlayer-0.90pre5.tar.bz2) = e5655c304af41b23701653eb7a810d3f
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index 074fbc9c7299..6550647eebf3 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,9 +1,9 @@
---- configure.orig Mon May 13 22:52:10 2002
-+++ configure Tue Jun 4 23:08:36 2002
-@@ -450,19 +450,10 @@
+--- configure.orig Mon Jun 10 20:46:18 2002
++++ configure Mon Jun 10 20:48:32 2002
+@@ -469,19 +469,10 @@
# Try to find the available options for the current CPU
- if x86 ; then
+ if x86 || ppc; then
- if test -r /proc/cpuinfo ; then
- # linux with /proc mounted, extract cpu information from it
- _cpuinfo="cat /proc/cpuinfo"
@@ -11,7 +11,7 @@
- # FreeBSD with linux emulation /proc mounted,
- # extract cpu information from it
- _cpuinfo="cat /compat/linux/proc/cpuinfo"
-- else
+- elif x86; then
# all other OS try to extract cpu information from a small helper
# program TOOLS/cpuinfo instead
$_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
@@ -20,7 +20,7 @@
pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
-@@ -1412,13 +1403,7 @@
+@@ -1485,13 +1476,7 @@
echocheck "memalign()"
@@ -34,7 +34,7 @@
if test "$_memalign" = yes ; then
_def_memalign='#define HAVE_MEMALIGN 1'
else
-@@ -1495,31 +1480,7 @@
+@@ -1568,31 +1553,7 @@
echocheck "pthread"
@@ -67,7 +67,7 @@
echores "yes (using $_ld_pthread)"
-@@ -3064,11 +3025,7 @@
+@@ -3219,11 +3180,7 @@
echocheck "iconv"
if test "$_iconv" = auto ; then
@@ -79,7 +79,7 @@
cat > $TMPC << EOF
#include <stdio.h>
#include <unistd.h>
-@@ -3102,7 +3059,7 @@
+@@ -3257,7 +3214,7 @@
EOF
_iconv=no
if freebsd ; then
@@ -88,7 +88,7 @@
elif bsdos ; then
cc_check -lm -liconv && _iconv=yes
else
-@@ -3111,7 +3068,7 @@
+@@ -3266,7 +3223,7 @@
fi
if test "$_iconv" = yes ; then
_def_iconv='#define USE_ICONV 1'
@@ -97,7 +97,7 @@
bsdos && _ld_iconv='-liconv'
else
_def_iconv='#undef USE_ICONV'
-@@ -3570,7 +3527,7 @@
+@@ -3733,7 +3690,7 @@
CFLAGS="$CFLAGS -D_REENTRANT"
elif bsd ; then
# FIXME bsd needs this so maybe other OS'es
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
index f86893178d60..f6d513c0d3f9 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,6 +1,6 @@
---- Makefile.orig Tue May 21 09:11:05 2002
-+++ Makefile Tue May 21 09:14:55 2002
-@@ -18,12 +18,12 @@
+--- Makefile.orig Mon Jun 10 20:49:19 2002
++++ Makefile Mon Jun 10 20:51:43 2002
+@@ -24,12 +24,12 @@
endif
#prefix = /usr/local
@@ -16,21 +16,21 @@
SRCS_COMMON = xacodec.c cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c find_sub.c
SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c me-opt-reg.c
-@@ -220,44 +220,11 @@
+@@ -226,44 +226,11 @@
ifeq ($(VIDIX),yes)
$(DO_MAKE)
endif
- if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
- $(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
+ $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
-ifeq ($(GUI),yes)
-- -ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+- -ln -sf $(PRG) $(BINDIR)/gmplayer
-endif
- if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
- $(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
+ @${BSD_INSTALL_MAN} DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
ifeq ($(MENCODER),yes)
- $(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
- -ln -sf $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1
+ $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+ -ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1
-endif
- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
@@ -50,7 +50,7 @@
-ifeq ($(DVDKIT),yes)
-ifeq ($(DVDKIT_SHARED),yes)
- if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
-- $(INSTALL) -m 755 -s libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+- $(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
-endif
-endif
-ifeq ($(CSS_USE),yes)
@@ -58,7 +58,7 @@
- @echo "however it means you can't use fibmap_mplayer."
- @echo "Without this (or without running mplayer as root) you won't be"
- @echo "able to play encrypted DVDs."
-- -$(INSTALL) -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
+- -$(INSTALL) -o 0 -g 0 -m 4755 $(INSTALLSTRIP) $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
endif
uninstall:
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index 1831ad5a2091..26872a2ffad3 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -7,6 +7,7 @@ lib/mplayer/vidix/mach64_vid.so
lib/mplayer/vidix/mga_crtc2_vid.so
lib/mplayer/vidix/mga_vid.so
lib/mplayer/vidix/nvidia_vid.so
+lib/mplayer/vidix/pm3_vid.so
lib/mplayer/vidix/radeon_vid.so
lib/mplayer/vidix/rage128_vid.so
%%PORTDOCS%%share/doc/mplayer/DVB
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 43a68760e998..c3de6f8f2b40 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -6,16 +6,17 @@
#
PORTNAME= mplayer
-PORTVERSION= 0.90.0.4
-PORTREVISION= 1
+PORTVERSION= 0.90.0.5
CATEGORIES= graphics
MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \
http://www.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
+ http://ftp.lug.udel.edu/MPlayer/releases/ \
ftp://ftp.mplayerhq.hu/MPlayer/releases/ \
ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
+ ftp://ftp.lug.udel.edu/MPlayer/releases/ \
http://www.rrr.de/~riggs/mplayer/
-DISTNAME= MPlayer-0.90pre4
+DISTNAME= MPlayer-0.90pre5
MAINTAINER= riggs@rrr.de
diff --git a/multimedia/mplayerxp/distinfo b/multimedia/mplayerxp/distinfo
index dad620f9f409..34f07d2846f8 100644
--- a/multimedia/mplayerxp/distinfo
+++ b/multimedia/mplayerxp/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.90pre4.tar.bz2) = 987436bd5f94a718d4813a6c69f07625
+MD5 (MPlayer-0.90pre5.tar.bz2) = e5655c304af41b23701653eb7a810d3f
diff --git a/multimedia/mplayerxp/files/patch-ad b/multimedia/mplayerxp/files/patch-ad
index 074fbc9c7299..6550647eebf3 100644
--- a/multimedia/mplayerxp/files/patch-ad
+++ b/multimedia/mplayerxp/files/patch-ad
@@ -1,9 +1,9 @@
---- configure.orig Mon May 13 22:52:10 2002
-+++ configure Tue Jun 4 23:08:36 2002
-@@ -450,19 +450,10 @@
+--- configure.orig Mon Jun 10 20:46:18 2002
++++ configure Mon Jun 10 20:48:32 2002
+@@ -469,19 +469,10 @@
# Try to find the available options for the current CPU
- if x86 ; then
+ if x86 || ppc; then
- if test -r /proc/cpuinfo ; then
- # linux with /proc mounted, extract cpu information from it
- _cpuinfo="cat /proc/cpuinfo"
@@ -11,7 +11,7 @@
- # FreeBSD with linux emulation /proc mounted,
- # extract cpu information from it
- _cpuinfo="cat /compat/linux/proc/cpuinfo"
-- else
+- elif x86; then
# all other OS try to extract cpu information from a small helper
# program TOOLS/cpuinfo instead
$_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
@@ -20,7 +20,7 @@
pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
-@@ -1412,13 +1403,7 @@
+@@ -1485,13 +1476,7 @@
echocheck "memalign()"
@@ -34,7 +34,7 @@
if test "$_memalign" = yes ; then
_def_memalign='#define HAVE_MEMALIGN 1'
else
-@@ -1495,31 +1480,7 @@
+@@ -1568,31 +1553,7 @@
echocheck "pthread"
@@ -67,7 +67,7 @@
echores "yes (using $_ld_pthread)"
-@@ -3064,11 +3025,7 @@
+@@ -3219,11 +3180,7 @@
echocheck "iconv"
if test "$_iconv" = auto ; then
@@ -79,7 +79,7 @@
cat > $TMPC << EOF
#include <stdio.h>
#include <unistd.h>
-@@ -3102,7 +3059,7 @@
+@@ -3257,7 +3214,7 @@
EOF
_iconv=no
if freebsd ; then
@@ -88,7 +88,7 @@
elif bsdos ; then
cc_check -lm -liconv && _iconv=yes
else
-@@ -3111,7 +3068,7 @@
+@@ -3266,7 +3223,7 @@
fi
if test "$_iconv" = yes ; then
_def_iconv='#define USE_ICONV 1'
@@ -97,7 +97,7 @@
bsdos && _ld_iconv='-liconv'
else
_def_iconv='#undef USE_ICONV'
-@@ -3570,7 +3527,7 @@
+@@ -3733,7 +3690,7 @@
CFLAGS="$CFLAGS -D_REENTRANT"
elif bsd ; then
# FIXME bsd needs this so maybe other OS'es
diff --git a/multimedia/mplayerxp/files/patch-ae b/multimedia/mplayerxp/files/patch-ae
index f86893178d60..f6d513c0d3f9 100644
--- a/multimedia/mplayerxp/files/patch-ae
+++ b/multimedia/mplayerxp/files/patch-ae
@@ -1,6 +1,6 @@
---- Makefile.orig Tue May 21 09:11:05 2002
-+++ Makefile Tue May 21 09:14:55 2002
-@@ -18,12 +18,12 @@
+--- Makefile.orig Mon Jun 10 20:49:19 2002
++++ Makefile Mon Jun 10 20:51:43 2002
+@@ -24,12 +24,12 @@
endif
#prefix = /usr/local
@@ -16,21 +16,21 @@
SRCS_COMMON = xacodec.c cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c find_sub.c
SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c me-opt-reg.c
-@@ -220,44 +220,11 @@
+@@ -226,44 +226,11 @@
ifeq ($(VIDIX),yes)
$(DO_MAKE)
endif
- if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
- $(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
+ $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
-ifeq ($(GUI),yes)
-- -ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+- -ln -sf $(PRG) $(BINDIR)/gmplayer
-endif
- if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
- $(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
+ @${BSD_INSTALL_MAN} DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
ifeq ($(MENCODER),yes)
- $(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
- -ln -sf $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1
+ $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+ -ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1
-endif
- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
@@ -50,7 +50,7 @@
-ifeq ($(DVDKIT),yes)
-ifeq ($(DVDKIT_SHARED),yes)
- if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
-- $(INSTALL) -m 755 -s libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+- $(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
-endif
-endif
-ifeq ($(CSS_USE),yes)
@@ -58,7 +58,7 @@
- @echo "however it means you can't use fibmap_mplayer."
- @echo "Without this (or without running mplayer as root) you won't be"
- @echo "able to play encrypted DVDs."
-- -$(INSTALL) -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
+- -$(INSTALL) -o 0 -g 0 -m 4755 $(INSTALLSTRIP) $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
endif
uninstall:
diff --git a/multimedia/mplayerxp/pkg-plist b/multimedia/mplayerxp/pkg-plist
index 1831ad5a2091..26872a2ffad3 100644
--- a/multimedia/mplayerxp/pkg-plist
+++ b/multimedia/mplayerxp/pkg-plist
@@ -7,6 +7,7 @@ lib/mplayer/vidix/mach64_vid.so
lib/mplayer/vidix/mga_crtc2_vid.so
lib/mplayer/vidix/mga_vid.so
lib/mplayer/vidix/nvidia_vid.so
+lib/mplayer/vidix/pm3_vid.so
lib/mplayer/vidix/radeon_vid.so
lib/mplayer/vidix/rage128_vid.so
%%PORTDOCS%%share/doc/mplayer/DVB
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 16:16:31 +0000