diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-10-01 14:04:20 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2001-10-01 14:04:20 +0000 |
commit | ce216f3e59f420584434222cf1c86cc826bccbb9 (patch) | |
tree | 1dfb775ea779cba0648260ed0d49de560d4b6254 /multimedia/mplayerxp | |
parent | o add the codecs from mplayer-codecs, this port will hold all win32 (diff) |
o update to 0.50 pre 1
o add script to "autodetect" some machine features such as 3DNow!
o it is no longer limitted to i386 arch (e.g., alpha, hurray :)
o make it CFLAGS safe
o add several WITH{,OUT} options
o depend on win32-codecs as of rev 1.12 win32-codecs/Makefile
instead of mplayer-codecs
o Makefile style: rearrange the file a bit to make it ports' style
compliant (easier to maintain)
o simplify targets with for/endfor constructs in post-install
o due to new features, update: COMMENT, DESCR, PKGMESSAGE
o fix all URI to include a trailing /
o support NOPORTDOCS in PLIST
Submitted by: MAINTAINER et al
Notes
Notes:
svn path=/head/; revision=48312
Diffstat (limited to 'multimedia/mplayerxp')
-rw-r--r-- | multimedia/mplayerxp/Makefile | 133 | ||||
-rw-r--r-- | multimedia/mplayerxp/distinfo | 2 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/get-feat | 18 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/patch-Gui::mplayer::gtk::fs.h | 11 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/patch-Gui::mplayer::psignal.h | 11 | ||||
-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 | 200 | ||||
-rw-r--r-- | multimedia/mplayerxp/files/patch-ae | 25 | ||||
-rw-r--r-- | multimedia/mplayerxp/pkg-comment | 2 | ||||
-rw-r--r-- | multimedia/mplayerxp/pkg-descr | 2 | ||||
-rw-r--r-- | multimedia/mplayerxp/pkg-message | 3 | ||||
-rw-r--r-- | multimedia/mplayerxp/pkg-plist | 21 |
13 files changed, 243 insertions, 217 deletions
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index cecee71ffa8a..b350a90e4ccd 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -6,93 +6,118 @@ # PORTNAME= mplayer -PORTVERSION= 0.18 +PORTVERSION= 0.50.0.1 CATEGORIES= graphics -MASTER_SITES= http://MPlayerHQ.hu/MPlayer/releases/ \ - http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ -DISTNAME= MPlayer-${PORTVERSION}pre -EXTRACT_SUFX= .tgz +MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \ + http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \ + http://www.rrr.de/~riggs/mplayer/ +DISTNAME= MPlayer-0.50pre1 MAINTAINER= riggs@rrr.de -ONLY_FOR_ARCHS= i386 +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ + SDL-1.1.3:${PORTSDIR}/devel/sdl12 +RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts -WRKSRC= ${WRKDIR}/MPlayer-${PORTVERSION}pre5 +USE_BZIP2= yes +USE_GMAKE= yes +USE_XLIB= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-esd CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -CFLAGS+= -O3 -ffast-math -fomit-frame-pointer MAN1= mplayer.1 MANCOMPRESSED= no -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_XLIB= yes +CONFFILES= codecs.conf example.conf +DOCFILES= DVB bugreports.html cd-dvd.html codecs-in.html \ + codecs.html documentation.html faq.html skin-en.html \ + sound.html video.html tech/tech-eng.txt -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -RUN_DEPENDS= ${PREFIX}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts +.include <bsd.port.pre.mk> -CONFIGURE_ARGS+=--disable-esd +.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) +.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" +.endif -.include <bsd.port.pre.mk> +# hack to cope with dmesg standard vs ports standard +.if (WITH_3DNow!) +WITH_3DNOW= yes +.endif -.if defined(WITH_SDL) -LIB_DEPENDS+= SDL-1.1.3:${PORTSDIR}/devel/sdl12 -.else -BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm +.if defined(WITH_OPTIMIZED_CFLAGS) +CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif -.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 + +.if defined(WITH_GUI) +USE_GTK= yes +CONFIGURE_ARGS+= --enable-gui +.endif + +# "enable" build for other archs +.if ${ARCH} == "i386" +.if defined(WITH_MMX) +CONFIGURE_ARGS+=--enable-mmx +.endif +.if defined(WITH_3DNOW) && ${OSVERSION} >= 400021 CONFIGURE_ARGS+=--enable-3dnow .endif -.if !defined(WITHOUT_3DNOWEX) && !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 +.if defined(WITH_DSP) && defined(WITH_3DNOW) && ${OSVERSION} >= 400021 CONFIGURE_ARGS+=--enable-3dnowex .endif -.if !defined(WITHOUT_MMX2) -CONFIGURE_ARGS+=--enable-mmx2 -.endif .if defined(WITH_SSE) -CONFIGURE_ARGS+=--enable-sse -.endif -.if defined(USE_AVIFILE_CODECS) -BUILD_DEPENDS+= ${PREFIX}/lib/win32:${PORTSDIR}/graphics/win32-codecs -.else -BUILD_DEPENDS+= ${PREFIX}/lib/mplayer-codecs:${PORTSDIR}/graphics/mplayer-codecs -CONFIGURE_ARGS+=--with-win32libdir=${LOCALBASE}/lib/mplayer-codecs +CONFIGURE_ARGS+=--enable-mmx2 --enable-sse .endif +.if !defined(WITHOUT_WIN32_CODECS) +RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} -pre-extract: +CONFIGURE_ARGS+= --with-win32libdir=${LOCALBASE}/lib/win32 -.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 - @${ECHO_MSG} "You can disable 3DNow! support by defining WITHOUT_3DNOW" +CODEC_PORT= ${PORTSDIR}/graphics/win32-codecs +CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE .endif +.endif # ARCH == i386 -.if !defined(WITHOUT_3DNOWEX) && !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 - @${ECHO_MSG} "You can disable K7 3DNow! extension support by defining WITHOUT_3DNOWEX" +pre-everything:: +.if !defined(WITH_OPTIMIZED_CFLAGS) + @${ECHO_MSG} "You can enable additional compilation optimizations" + @${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS" +.endif +.if !defined(WITH_GUI) + @${ECHO} "You can enable GTK GUI by defining WITH_GUI." .endif -.if !defined(WITHOUT_MMX2) - @${ECHO_MSG} "You can disable MMX2 support by defining WITHOUT_MMX2" +.if ${ARCH} == "i386" +.if !defined(WITHOUT_WIN32_CODECS) + @${ECHO_MSG} "You can disable support (this turns this into a X86 only port)" + @${ECHO_MSG} "for Win32 codecs" .endif -.if !defined(WITH_SSE) - @${ECHO_MSG} "You can enable SSE optimized decoding by defining WITH_SSE" +.if defined(WITH_SSE) @${ECHO_MSG} "You have to enable \"options CPU_ENABLE_SSE\" in your kernel" - @${ECHO_MSG} "config in order to enable kernel support for SSE." + @${ECHO_MSG} "config in order to enable kernel support for SSE/MMX2." .endif +.endif # ARCH == i386 + +pre-configure: + @${RM} -f "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" + @${MKDIR} "${WRKDIRPREFIX}${.CURDIR}" + @${SETENV} TEMPDIR="${WRKDIRPREFIX}${.CURDIR}" ${PERL} ${FILESDIR}/get-feat + +post-configure: + @${RM} -f "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" post-install: - @${MKDIR} ${PREFIX}/share/mplayer - @${CHMOD} 755 ${PREFIX}/share/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/codecs.conf ${PREFIX}/share/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/example.conf ${PREFIX}/share/mplayer + @${MKDIR} ${DATADIR} + @${CHMOD} 755 ${DATADIR} +.for conf in ${CONFFILES} + ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR} +.endfor .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/mplayer - @${CHMOD} 755 ${PREFIX}/share/doc/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/DGA ${PREFIX}/share/doc/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/FREEBSD ${PREFIX}/share/doc/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/MPlayer-FAQ ${PREFIX}/share/doc/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/OpenDivX ${PREFIX}/share/doc/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/README ${PREFIX}/share/doc/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/SDL ${PREFIX}/share/doc/mplayer - @${INSTALL_DATA} ${WRKSRC}/DOCS/VIDEOCARDS ${PREFIX}/share/doc/mplayer + @${MKDIR} ${DOCSDIR} + @${CHMOD} 755 ${DOCSDIR} +.for doc in ${DOCFILES} + @${INSTALL_DATA} ${WRKSRC}/DOCS/${doc} ${DOCSDIR} +.endfor .endif @${CAT} pkg-message diff --git a/multimedia/mplayerxp/distinfo b/multimedia/mplayerxp/distinfo index 3c2abb092929..e7590972a303 100644 --- a/multimedia/mplayerxp/distinfo +++ b/multimedia/mplayerxp/distinfo @@ -1 +1 @@ -MD5 (MPlayer-0.18pre.tgz) = cc86cd8cdc61d6aea243c6e539b5df2e +MD5 (MPlayer-0.50pre1.tar.bz2) = 5a71689dda88731e1dba596e270fa3d9 diff --git a/multimedia/mplayerxp/files/get-feat b/multimedia/mplayerxp/files/get-feat new file mode 100644 index 000000000000..07deea5e6107 --- /dev/null +++ b/multimedia/mplayerxp/files/get-feat @@ -0,0 +1,18 @@ +#This perl script will determine the supported CPU features +#of this machine, so the build of the correct decode plugins +#will do automatically + +@list=`cat /var/run/dmesg.boot|grep Feat`; +@features=("MMX","SSE","3DNow!","DSP"); +open (INC,">$ENV{TEMPDIR}/Makefile.inc"); +foreach $feature(@features) +{ + foreach $line(@list) + { + if ( $line =~ m/$feature/) + { + print INC "WITH_$feature = yes\n"; + } + } +} +close (INC); diff --git a/multimedia/mplayerxp/files/patch-Gui::mplayer::gtk::fs.h b/multimedia/mplayerxp/files/patch-Gui::mplayer::gtk::fs.h new file mode 100644 index 000000000000..bbe349a91da3 --- /dev/null +++ b/multimedia/mplayerxp/files/patch-Gui::mplayer::gtk::fs.h @@ -0,0 +1,11 @@ +--- Gui/mplayer/gtk/fs.h.orig Fri Sep 28 19:48:50 2001 ++++ Gui/mplayer/gtk/fs.h Fri Sep 28 19:49:11 2001 +@@ -9,7 +9,7 @@ + #include <glob.h> + #include <unistd.h> + +-#ifdef __SVR4 ++#if defined(__SVR4) || defined (__FreeBSD__) + #define get_current_dir_name() getcwd(NULL, PATH_MAX) + #endif + diff --git a/multimedia/mplayerxp/files/patch-Gui::mplayer::psignal.h b/multimedia/mplayerxp/files/patch-Gui::mplayer::psignal.h new file mode 100644 index 000000000000..a5c3768cdc7e --- /dev/null +++ b/multimedia/mplayerxp/files/patch-Gui::mplayer::psignal.h @@ -0,0 +1,11 @@ +--- Gui/mplayer/psignal.h.orig Fri Sep 28 19:46:22 2001 ++++ Gui/mplayer/psignal.h Fri Sep 28 19:46:55 2001 +@@ -39,7 +39,7 @@ + #define mplIncAudioBufferDelay 28 + #define mplDecAudioBufferDelay 29 + +-#ifdef __SVR4 ++#if defined(__SVR4) || defined(__FreeBSD__) + #define SIGTYPE SIGUSR2 + #warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too? + #else 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 index 941cb9a01492..82abd70949a2 100644 --- a/multimedia/mplayerxp/files/patch-ad +++ b/multimedia/mplayerxp/files/patch-ad @@ -1,104 +1,96 @@ -*** 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 +--- configure.orig Fri Sep 28 19:21:08 2001 ++++ configure Fri Sep 28 19:33:35 2001 +@@ -299,7 +299,7 @@ + _confcygwin="TARGET_CYGWIN=no" + _confwin32= + if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then +- _archlibs="-rdynamic -pthread" ++ _archlibs="-rdynamic ${PTHREAD_LIBS}" + elif [ `echo $system_name | sed 's/[cC][yY][gG][wW][iI][nN].*/CYGWIN/'` = "CYGWIN" ]; then + _confcygwin="TARGET_CYGWIN=yes" + _confwin32="#define WIN32" +@@ -766,7 +766,7 @@ + $_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lvgagl -lvga > /dev/null 2>&1 && _svga=yes + + if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then +-$_cc $TMPC -o $TMPO -pthread > /dev/null 2>&1 || \ ++$_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 || \ +@@ -861,7 +861,7 @@ + + # this is not yet checked with OpenBSD - atmos + if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then +-$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 && _gl=yes ++$_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 +@@ -872,7 +872,7 @@ + EOF + # this is not yet checked with OpenBSD - atmos + if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then +-$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 || \ ++$_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 || \ +@@ -1613,33 +1613,33 @@ + + echo + echo $_echo_n "Checking for gtk version ... $_echo_c" +-_gtk=`gtk-config --version 2>&1` ++_gtk=`${GTK_CONFIG} --version 2>&1` + [ -z "$_gtk" ] && { echo 'gtk not found.'; exit 1; } + echo "$_gtk" + + echo $_echo_n "Checking for gtk includes ... $_echo_c" +-_gtkinc=`gtk-config --cflags 2>&1` ++_gtkinc=`${GTK_CONFIG} --cflags 2>&1` + [ -z "$_gtkinc" ] && { echo 'gtk not found.'; exit 1; } + echo "done" + + echo $_echo_n "Checking for gtk libs ... $_echo_c" +-_gtklib=`gtk-config --libs 2>&1` ++_gtklib=`${GTK_CONFIG} --libs 2>&1` + [ -z "$_gtklib" ] && { echo 'gtk not found.'; exit 1; } + echo "done" + + echo + echo $_echo_n "Checking for glib version ... $_echo_c" +-_glib=`glib-config --version 2>&1` ++_glib=`${GLIB_CONFIG} --version 2>&1` + [ -z "$_glib" ] && { echo 'glib not found.'; exit 1; } + echo "$_glib" + + echo $_echo_n "Checking for glib includes ... $_echo_c" +-_glibinc=`glib-config --cflags 2>&1` ++_glibinc=`${GLIB_CONFIG} --cflags 2>&1` + [ -z "$_glibinc" ] && { echo 'glib not found.'; exit 1; } + echo "done" + + echo $_echo_n "Checking for glib libs ... $_echo_c" +-_gliblib=`glib-config --libs 2>&1` ++_gliblib=`${GLIB_CONFIG} --libs 2>&1` + [ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; } + echo "done" + +@@ -1668,7 +1668,7 @@ + if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then + # Under XFree86 4.x GL port is poorly designed + if [ -r /usr/X11R6/bin/XFree86 ]; then +- _gllib='-lGL -pthread' ++ _gllib='-lGL ${PTHREAD_LIBS}' + else + _gllib='-lGL' + fi +@@ -1895,7 +1895,7 @@ + # 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" ++CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}" + fi + + # 64 bit file offsets? diff --git a/multimedia/mplayerxp/files/patch-ae b/multimedia/mplayerxp/files/patch-ae index 38fcf5b69e44..80b04bc7ede0 100644 --- a/multimedia/mplayerxp/files/patch-ae +++ b/multimedia/mplayerxp/files/patch-ae @@ -1,25 +1,20 @@ ---- 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 +--- Makefile.orig Fri Sep 28 19:37:12 2001 ++++ Makefile Fri Sep 28 19:41:53 2001 +@@ -113,15 +113,8 @@ $(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 + install: $(PRG) $(PRG_FIBMAP) +- install -d $(BINDIR) +- install -m 755 -s $(PRG) $(BINDIR)/$(PRG) +- install -d $(prefix)/man/man1 +- install -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) +- @echo "able to play encrypted DVDs." +- install -o root -g root -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) + 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) diff --git a/multimedia/mplayerxp/pkg-comment b/multimedia/mplayerxp/pkg-comment index 5624b3afc8a0..c804b4065b34 100644 --- a/multimedia/mplayerxp/pkg-comment +++ b/multimedia/mplayerxp/pkg-comment @@ -1 +1 @@ -High performance media player using win32 codecs +High performance media player that supports many formats diff --git a/multimedia/mplayerxp/pkg-descr b/multimedia/mplayerxp/pkg-descr index bc017a356b04..a613c1786f48 100644 --- a/multimedia/mplayerxp/pkg-descr +++ b/multimedia/mplayerxp/pkg-descr @@ -5,4 +5,4 @@ It is based on the windows codec compilation and provides the ability to play many formats in a very good quality without much CPU comsumption. -WWW: http://mplayer.sourceforge.net +WWW: http://mplayer.sourceforge.net/ diff --git a/multimedia/mplayerxp/pkg-message b/multimedia/mplayerxp/pkg-message index d47025ad2c16..242404f7723b 100644 --- a/multimedia/mplayerxp/pkg-message +++ b/multimedia/mplayerxp/pkg-message @@ -9,3 +9,6 @@ make install-user Please take a look at docs in /usr/local/share/doc/mplayer + +You can download skins from the mplayer homepage: +http://www.mplayerhq.hu/ diff --git a/multimedia/mplayerxp/pkg-plist b/multimedia/mplayerxp/pkg-plist index a76f0124d73c..004bead94968 100644 --- a/multimedia/mplayerxp/pkg-plist +++ b/multimedia/mplayerxp/pkg-plist @@ -1,12 +1,15 @@ bin/mplayer -share/doc/mplayer/DGA -share/doc/mplayer/FREEBSD -share/doc/mplayer/MPlayer-FAQ -share/doc/mplayer/OpenDivX -share/doc/mplayer/README -share/doc/mplayer/SDL -share/doc/mplayer/VIDEOCARDS +%%PORTDOCS%%share/doc/mplayer/DVB +%%PORTDOCS%%share/doc/mplayer/bugreports.html +%%PORTDOCS%%share/doc/mplayer/cd-dvd.html +%%PORTDOCS%%share/doc/mplayer/codecs-in.html +%%PORTDOCS%%share/doc/mplayer/codecs.html +%%PORTDOCS%%share/doc/mplayer/documentation.html +%%PORTDOCS%%share/doc/mplayer/faq.html +%%PORTDOCS%%share/doc/mplayer/skin-en.html +%%PORTDOCS%%share/doc/mplayer/sound.html +%%PORTDOCS%%share/doc/mplayer/video.html +%%PORTDOCS%%share/doc/mplayer/tech-eng.txt share/mplayer/codecs.conf share/mplayer/example.conf -@dirrm share/doc/mplayer -@dirrm share/mplayer +%%PORTDOCS%%@dirrm share/doc/mplayer |