ports/89906: multimedia/mplayer gtk2 patch

[Byung-Hee HWANG]

>Number:         89906
>Category:       ports
>Synopsis:       multimedia/mplayer gtk2 patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 04 00:40:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Byung-Hee HWANG
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
InZealBomb
>Environment:
System: FreeBSD viola.izb.knu.ac.kr 6.0-STABLE FreeBSD 6.0-STABLE #0: Sun Nov 13 18:16:33 MST 2005 bh at viola.izb.knu.ac.kr:/usr/src/sys/i386/compile/II82801BA i386

>Description:
This patch is available for using GTK2 of MPlayer. 
My test screenshot is here:
<URL:http://izb.knu.ac.kr/~bh/tmp/x11/ss/bits/freebsd6-mplayer-gtk2.png>

Reference:
<URL:http://linuxfromscratch.org/pipermail/patches/2005-May/002288.html>
	
>How-To-Repeat:
I tested it on FreeBSD 6.0-STABLE.

>Fix:

--- mplayer-gtk2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/mplayer/Makefile,v
retrieving revision 1.124
diff -u -r1.124 Makefile
--- Makefile	29 Nov 2005 19:02:12 -0000	1.124
+++ Makefile	3 Dec 2005 23:54:14 -0000
@@ -53,16 +53,7 @@
 # mplayer as a multi-format audio-only player, this one is for you.
 #
 # WITH_GTK1|WITH_GTK2
-# default: autodetect GTK1
-# if you want mplayer to have gui abilities, you can use this knob to define
-# which graphical toolkit set mplayer is built with.
-# It defaults to detect and use GTK1 if it finds a working installation on the
-# system. This can be overridden by choosing WITH_GTK2 or disable graphical
-# 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.
+# default: autodetect GTK2
 #
 # WITHOUT_GUI
 # default: undefined
@@ -270,7 +261,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.99.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -473,11 +464,11 @@
 CFLAGS=		#let mplayer decide on this
 CONFIGURE_ARGS+=--enable-runtime-cpudetection
 #GUI
-USE_GNOME+=	gtk12
+USE_GNOME+=	gtk20
 .if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gtk
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gtk2
 .else
-PKGNAMESUFFIX=	-gtk
+PKGNAMESUFFIX=	-gtk2
 .endif
 CONFIGURE_ARGS+=	--enable-gui
 PLIST_SUB+=	GMPLAYER=""
@@ -553,8 +544,8 @@
 .endif
 
 #.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
-.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GUI)
-WITH_GTK1=	yes
+.if ${HAVE_GNOME:Mgtk20}!="" && !defined(WITHOUT_GUI)
+WITH_GTK2=	yes
 .endif
 
 .if !defined(WITHOUT_GUI)
@@ -567,21 +558,24 @@
 .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(WITHOUT_GUI)
+.if ( ${OSVERSION} < 500000 )
+USE_GCC=	3.4
+.endif
+USE_GNOME+=	gtk20
+PATCH_SITES+=   http://izb.knu.ac.kr/~bh/diffs/
+PATCHFILES+=    MPlayer-1.0pre7try2_GTK2.diff
+PATCH_DIST_STRIP+=      -p1
+.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_GTK1) && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
 .if defined(WITH_GTK1) && !defined(WITHOUT_GUI)
@@ -591,7 +585,7 @@
 .else
 PKGNAMESUFFIX=	-gtk
 .endif
-CONFIGURE_ARGS+=	--enable-gui
+CONFIGURE_ARGS+=	--enable-old-gtk
 .endif
 
 .if defined(WITHOUT_GUI)
@@ -856,8 +850,8 @@
 	@${ECHO_MSG} "Take a careful look into the Makefile in order"
 	@${ECHO_MSG} "to learn how to tune mplayer towards you personal preferences!"
 	@${ECHO_MSG} "For example,"
-	@${ECHO_MSG} "make WITH_GTK1"
-	@${ECHO_MSG} "builds MPlayer with GTK1-GUI support."
+	@${ECHO_MSG} "make WITH_GTK2"
+	@${ECHO_MSG} "builds MPlayer with GTK2-GUI support."
 
 .if !defined(WITHOUT_GUI)
 	@${ECHO_MSG} "If you want to use the GUI, you can either install"
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/multimedia/mplayer/distinfo,v
retrieving revision 1.31
diff -u -r1.31 distinfo
--- distinfo	9 Nov 2005 20:17:44 -0000	1.31
+++ distinfo	3 Dec 2005 23:54:14 -0000
@@ -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.diff) = c8b60c5fa24bfadeca1c8c554801d1ae
+SHA256 (MPlayer-1.0pre7try2_GTK2.diff) = ababd336410450020066d177d9a0ace0062ff995e289e8d707f56f45a19a9054
+SIZE (MPlayer-1.0pre7try2_GTK2.diff) = 5842
--- mplayer-gtk2.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: