diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2001-09-16 01:02:46 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2001-09-16 01:02:46 +0000 |
commit | db3dca6dbd32fe6ea3d51bc037e6f9cdc66c343b (patch) | |
tree | 29d590ca0bc9e66d81bc3218a0684c2daf9d4a68 /multimedia/mplayerxp/files | |
parent | Fix compilation problems. (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_4_0'.release/4.4.0
Notes
Notes:
svn path=/head/; revision=47856
svn path=/tags/RELEASE_4_4_0/; revision=47857; tag=release/4.4.0
Diffstat (limited to 'multimedia/mplayerxp/files')
-rw-r--r-- | multimedia/mplayerxp/files/install-user | 38 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/patch-ab | 13 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/patch-ac | 19 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/patch-ad | 104 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/patch-ae | 25 |
5 files changed, 0 insertions, 199 deletions
diff --git a/multimedia/mplayerxp/files/install-user b/multimedia/mplayerxp/files/install-user deleted file mode 100644 index 8f0dda4a6adf..000000000000 --- a/multimedia/mplayerxp/files/install-user +++ /dev/null @@ -1,38 +0,0 @@ -#This perl script links the codec config file -#and the fonts dir to the user's home dir. - -if (-e "$ENV{HOME}/.mplayer/") -{ - print "Sorry, you should execute this target without having a .mplayer directory in your homedir.\n"; - exit 1; -} - -#Determining location of fonts: - -@pkg=`pkg_info -Lx mplayer-fonts`; -print "$prefix[3]"; -$prefix=$pkg[3]; -$prefix=~ s/(.+mplayer).*/$1/; -chop $prefix; - -print "You may choose any of the available language sets:\n\n"; -print "European fonts (e.g. dutch, french, german...) : e\n"; -print "Cyrillic fonts : c\n"; -print "Russian fonts: r\n"; - -print "Your decision? "; -chomp ($lang=<STDIN>); -print "\n"; - -system "mkdir $ENV{HOME}/.mplayer"; -if ($lang eq "c") -{ - system "ln -s $prefix/fonts/cyrillic/ $ENV{HOME}/.mplayer/font"; -} -elsif ($lang eq "r") -{ - system "ln -s $prefix/fonts/koi8r/ $ENV{HOME}/.mplayer/font"; -} -else {system "ln -s $prefix/fonts/iso/ $ENV{HOME}/.mplayer/font"}; - -system "ln -s $prefix/codecs.conf $ENV{HOME}/.mplayer/codecs.conf"; diff --git a/multimedia/mplayerxp/files/patch-ab b/multimedia/mplayerxp/files/patch-ab deleted file mode 100644 index dd5250a5197a..000000000000 --- a/multimedia/mplayerxp/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -*** /home/volodya/usr/ports/graphics/mplayer/work/MPlayer-0.18pre5/DOCS/FREEBSD Thu Jun 21 03:06:40 2001 ---- DOCS/FREEBSD Thu Aug 16 03:54:08 2001 -*************** -*** 6,11 **** ---- 6,13 ---- - - 2. To run mplayer you will need to re-compile the kernel with - "options USER_LDT" (unless you are running -CURRENT, where this is default). -+ If you have a CPU with SSE also use "options CPU_ENABLE_SSE" to use it -+ (FreeBSD-STABLE required, or use kernel patches). - - 3. If mplayer complains about "CD-ROM Device '/dev/cdrom' not found!" make a - symbolic link : ln -s /dev/<your_cdrom_device> /dev/cdrom diff --git a/multimedia/mplayerxp/files/patch-ac b/multimedia/mplayerxp/files/patch-ac deleted file mode 100644 index 88ba8cb70b7e..000000000000 --- a/multimedia/mplayerxp/files/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -*** ../MPlayer-0.18pre5.old/loader/config.h Sat Feb 24 22:30:26 2001 ---- loader/config.h Fri Aug 17 10:14:46 2001 -*************** -*** 56,62 **** - #define HAVE_LIMITS_H 1 - - /* Define if you have the <malloc.h> header file. */ -! #define HAVE_MALLOC_H 1 - - /* Define if you have the <sys/ioctl.h> header file. */ - #define HAVE_SYS_IOCTL_H 1 ---- 56,62 ---- - #define HAVE_LIMITS_H 1 - - /* Define if you have the <malloc.h> header file. */ -! /* #undef HAVE_MALLOC_H */ - - /* Define if you have the <sys/ioctl.h> header file. */ - #define HAVE_SYS_IOCTL_H 1 diff --git a/multimedia/mplayerxp/files/patch-ad b/multimedia/mplayerxp/files/patch-ad deleted file mode 100644 index 941cb9a01492..000000000000 --- a/multimedia/mplayerxp/files/patch-ad +++ /dev/null @@ -1,104 +0,0 @@ -*** configure.orig Fri Jul 6 23:00:22 2001 ---- configure Sat Aug 18 22:25:58 2001 -*************** -*** 181,187 **** - - system_name=`uname -s 2>&1` - if [ "$system_name" = "FreeBSD" ]; then -! _archlibs="-rdynamic -pthread" - else - _archlibs="-ldl -lpthread" - fi ---- 181,187 ---- - - system_name=`uname -s 2>&1` - if [ "$system_name" = "FreeBSD" ]; then -! _archlibs="-rdynamic ${PTHREAD_LIBS}" - else - _archlibs="-ldl -lpthread" - fi -*************** -*** 587,593 **** - $_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lvgagl -lvga > /dev/null 2>&1 && _svga=yes - - if [ "$system_name" = "FreeBSD" ]; then -! $_cc $TMPC -o $TMPO -pthread > /dev/null 2>&1 || \ - { echo "Lib pthread not found."; rm -f $TMPC $TMPO $TMPS ; exit 1; } - else - $_cc $TMPC -o $TMPO -lpthread > /dev/null 2>&1 || \ ---- 587,593 ---- - $_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lvgagl -lvga > /dev/null 2>&1 && _svga=yes - - if [ "$system_name" = "FreeBSD" ]; then -! $_cc $TMPC -o $TMPO ${PTHREAD_LIBS} > /dev/null 2>&1 || \ - { echo "Lib pthread not found."; rm -f $TMPC $TMPO $TMPS ; exit 1; } - else - $_cc $TMPC -o $TMPO -lpthread > /dev/null 2>&1 || \ -*************** -*** 669,675 **** - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXxf86vm $_socklib > /dev/null 2>&1 && _vm=yes - - if [ "$system_name" = "FreeBSD" ]; then -! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 && _gl=yes - else - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 && _gl=yes - fi ---- 669,675 ---- - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXxf86vm $_socklib > /dev/null 2>&1 && _vm=yes - - if [ "$system_name" = "FreeBSD" ]; then -! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 && _gl=yes - else - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 && _gl=yes - fi -*************** -*** 679,685 **** - int main( void ) { return 0; } - EOF - if [ "$system_name" = "FreeBSD" ]; then -! $_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 || \ - { _gl=no; echo "GL includes not found!";} - else - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 || \ ---- 679,685 ---- - int main( void ) { return 0; } - EOF - if [ "$system_name" = "FreeBSD" ]; then -! $_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 || \ - { _gl=no; echo "GL includes not found!";} - else - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 || \ -*************** -*** 1162,1168 **** - if [ "$system_name" = "FreeBSD" ]; then - # Under XFree86 4.x GL port is poorly designed - if [ -r /usr/X11R6/bin/XFree86 ]; then -! _gllib='-lGL -pthread' - else - _gllib='-lGL' - fi ---- 1162,1168 ---- - if [ "$system_name" = "FreeBSD" ]; then - # Under XFree86 4.x GL port is poorly designed - if [ -r /usr/X11R6/bin/XFree86 ]; then -! _gllib="-lGL ${PTHREAD_LIBS}" - else - _gllib='-lGL' - fi -*************** -*** 1329,1335 **** - # Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS - # for MT applications: - if [ "$system_name" = "FreeBSD" ]; then -! CFLAGS="$CFLAGS -D_THREAD_SAFE" - fi - - # echo 'CFLAGS=$(OPTFLAGS) -Wall -DMPG12PLAY' >> config.mak ---- 1329,1335 ---- - # Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS - # for MT applications: - if [ "$system_name" = "FreeBSD" ]; then -! CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}" - fi - - # echo 'CFLAGS=$(OPTFLAGS) -Wall -DMPG12PLAY' >> config.mak diff --git a/multimedia/mplayerxp/files/patch-ae b/multimedia/mplayerxp/files/patch-ae deleted file mode 100644 index 38fcf5b69e44..000000000000 --- a/multimedia/mplayerxp/files/patch-ae +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile Sun Jul 8 02:21:20 2001 -+++ Makefile.freebsd Wed Aug 15 19:23:54 2001 -@@ -85,14 +85,14 @@ - $(PRG_CFG): version.h codec-cfg.c codec-cfg.h - $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML - --install: $(PRG) $(PRG_FIBMAP) -- install -D -m 755 -s $(PRG) $(BINDIR)/$(PRG) -- install -D -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1 -- @echo "Following task requires root privs. If it fails don't panic" -- @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 DVDs." -- install -D -o root -g root -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) -+install: $(PRG) -+ install -C -m 755 -s $(PRG) $(BINDIR)/$(PRG) -+ install -C -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1 -+# @echo "Following task requires root privs. If it fails don't panic" -+# @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 DVDs." -+# install -D -o root -g root -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) - - clean: - rm -f *.o *~ $(OBJS) |