From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 10 00:40:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7305516A405 for ; Mon, 10 Apr 2006 00:40:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E55CF43D46 for ; Mon, 10 Apr 2006 00:40:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3A0eEkV048970 for ; Mon, 10 Apr 2006 00:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3A0eEk2048969; Mon, 10 Apr 2006 00:40:14 GMT (envelope-from gnats) Resent-Date: Mon, 10 Apr 2006 00:40:14 GMT Resent-Message-Id: <200604100040.k3A0eEk2048969@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Tom McLaughlin" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE35C16A400 for ; Mon, 10 Apr 2006 00:36:23 +0000 (UTC) (envelope-from tmclaugh@FreeBSD.org) Received: from straycat.dhs.org (c-24-63-86-11.hsd1.ma.comcast.net [24.63.86.11]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9616D43D49 for ; Mon, 10 Apr 2006 00:36:23 +0000 (GMT) (envelope-from tmclaugh@FreeBSD.org) Received: from bofh.straycat.dhs.org (bofh.straycat.dhs.org [192.168.1.56]) by straycat.dhs.org (8.13.4/8.13.4) with ESMTP id k3A0aMUv027201; Sun, 9 Apr 2006 20:36:22 -0400 (EDT) Message-Id: <1144629382.69869@bofh.straycat.dhs.org> Date: Sun, 9 Apr 2006 20:36:22 -0400 From: "Tom McLaughlin" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: riggs@rrr.de Subject: ports/95558: multimedia/mplayer: Reenable GTK2 support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 00:40:15 -0000 >Number: 95558 >Category: ports >Synopsis: multimedia/mplayer: Reenable GTK2 support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 10 00:40:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Tom McLaughlin >Release: FreeBSD 6.0-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD 6.0-RELEASE-p6 #0: Tue Apr 4 23:57:42 EDT 2006 root@bofh.straycat.dhs.org:/usr/obj/usr/src/sys/GENERIC_ULE >Description: Attached patch reenables GTK2 support in mplayer when WITH_GTK2 is defined. The gtk2 patch in my public distfiles space is based on the one found here at http://phaeronix.net/files/MPlayer-1.0pre7-gtk2.patch and updated to apply cleanly against the latest sources. The patch appears to be based on the CVS version of mplayer. Only issue I can find with the patch is right-clicking in mplayer is tempermental. On occassion I need to click pretty fast to get the menu to come up. From searching this appears to be a known issue. >How-To-Repeat: >Fix: --- mplayer-gtk2.diff begins here --- Index: Makefile =================================================================== RCS file: /ncvs/ports/multimedia/mplayer/Makefile,v retrieving revision 1.131 diff -u -r1.131 Makefile --- Makefile 8 Apr 2006 14:52:21 -0000 1.131 +++ Makefile 9 Apr 2006 23:05:23 -0000 @@ -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 @@ 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 @@ 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 @@ 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 Index: distinfo =================================================================== RCS file: /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 9 Apr 2006 23:05:23 -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.patch) = aa7ae259b66f3a88d4dff39faeea7354 +SHA256 (MPlayer-1.0pre7try2-gtk2.patch) = 15f13b741b0ed8ec5726e5c68d03d559c32582a3e2d1e3014685531c69a47ab2 +SIZE (MPlayer-1.0pre7try2-gtk2.patch) = 6177 --- mplayer-gtk2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: