aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorTom McLaughlin <tmclaugh@FreeBSD.org>2006-04-17 03:10:41 +0000
committerTom McLaughlin <tmclaugh@FreeBSD.org>2006-04-17 03:10:41 +0000
commit5cc0b532ecb10a0bdf5e8152e033eaec8e40b974 (patch)
tree13856f232dea7da93ffaa9bb7e22032900309850 /multimedia
parent88dc85abfec323d086608902b9810534227bd125 (diff)
downloadports-5cc0b532ecb10a0bdf5e8152e033eaec8e40b974.tar.gz
ports-5cc0b532ecb10a0bdf5e8152e033eaec8e40b974.zip
Notes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer/Makefile46
-rw-r--r--multimedia/mplayer/distinfo3
2 files changed, 25 insertions, 24 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index d71e09a3259f..edcccaaa8ff0 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -61,8 +61,8 @@
# user interface by defining WITHOUT_GUI
# Note: If you define WITH_GTK* *and* WITHOUT_GUI, mplayer will be built without
# gui capabilities.
-# At the moment there is no current gtk2 patch available, so defining this
-# knob has no effect right now.
+# The GTK2 patches are not official ones, so they should be considered
+# as experimental.
#
# WITHOUT_GUI
# default: undefined
@@ -287,8 +287,8 @@ DISTNAME= MPlayer-1.0pre7try2
MAINTAINER= riggs@rrr.de
COMMENT= High performance media player/encoder supporting many formats
-PATCH_SITES= http://www.win.net/~ardneh/patches/ \
- http://www.rrr.de/~riggs/mplayer/
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR= tmclaugh
PATCH_DIST_STRIP= -p1
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
@@ -551,8 +551,7 @@ CONFIGURE_ARGS+= --enable-debug
CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
.endif
-#.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
-.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GUI)
+.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
WITH_GTK1= yes
.endif
@@ -565,25 +564,24 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-ski
PLIST_SUB+= GMPLAYER="@comment "
.endif
-#.if defined(WITH_GTK2) && !defined(WITH_GTK1) && !defined(WITHOUT_GUI)
-#.if ( ${OSVERSION} < 500000 )
-#USE_GCC= 3.4
-#.endif
-#USE_GNOME+= gtk20
-#PATCHFILES+= mplayer1.0pre5-gtk2-20040730.patch.bz2
-#.if defined(PKGNAMESUFFIX)
-#PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk2
-#.else
-#PKGNAMESUFFIX= -gtk2
-#.endif
-#CONFIGURE_ARGS+= --enable-gui
-#.if defined(WITH_LANG)
-#WITH_LANG= ""
-#.endif
-#.endif
+.if defined(WITH_GTK2) && !defined(WITH_GTK1) && !defined(WITHOUT_GUI)
+.if ( ${OSVERSION} < 500000 )
+USE_GCC= 3.4
+.endif
+USE_GNOME+= gtk20
+PATCHFILES+= MPlayer-1.0pre7try2-gtk2.patch
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk2
+.else
+PKGNAMESUFFIX= -gtk2
+.endif
+CONFIGURE_ARGS+= --enable-gui --enable-gtk2
+.if defined(WITH_LANG)
+WITH_LANG= ""
+.endif
+.endif
-#.if defined(WITH_GTK1) && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
-.if defined(WITH_GTK1) && !defined(WITHOUT_GUI)
+.if defined(WITH_GTK1) && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
USE_GNOME+= gtk12
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index c76a1ac533b4..a1be44182647 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,6 @@
MD5 (MPlayer-1.0pre7try2.tar.bz2) = aaca4fd327176c1afb463f0f047ef6f4
SHA256 (MPlayer-1.0pre7try2.tar.bz2) = 006da26e16bd1b1a8aec5d59b72b0b2ae7716f4e7634859a3e88b6fbbec4d89a
SIZE (MPlayer-1.0pre7try2.tar.bz2) = 6868786
+MD5 (MPlayer-1.0pre7try2-gtk2.patch) = aa7ae259b66f3a88d4dff39faeea7354
+SHA256 (MPlayer-1.0pre7try2-gtk2.patch) = 15f13b741b0ed8ec5726e5c68d03d559c32582a3e2d1e3014685531c69a47ab2
+SIZE (MPlayer-1.0pre7try2-gtk2.patch) = 6177