From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 8 00:10:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A9A916A41A for ; Thu, 8 Nov 2007 00:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D040313C4BF for ; Thu, 8 Nov 2007 00:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id lA80A1kD076958 for ; Thu, 8 Nov 2007 00:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id lA80A1Uc076957; Thu, 8 Nov 2007 00:10:01 GMT (envelope-from gnats) Resent-Date: Thu, 8 Nov 2007 00:10:01 GMT Resent-Message-Id: <200711080010.lA80A1Uc076957@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, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F96716A420 for ; Thu, 8 Nov 2007 00:05:47 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from cp65.agava.net (cp65.agava.net [89.108.66.215]) by mx1.freebsd.org (Postfix) with ESMTP id 78A0613C4B8 for ; Thu, 8 Nov 2007 00:05:46 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from [213.148.20.85] (helo=nexii.panopticon) by cp65.agava.net with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.44 (FreeBSD)) id 1Iputi-0001ND-I1 for FreeBSD-gnats-submit@freebsd.org; Thu, 08 Nov 2007 03:05:26 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id AEC261703E for ; Thu, 8 Nov 2007 03:06:52 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 86E8B40AD; Thu, 8 Nov 2007 03:07:03 +0300 (MSK) Message-Id: <20071108000703.86E8B40AD@hades.panopticon> Date: Thu, 8 Nov 2007 03:07:03 +0300 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/117904: [MAINTAINER] graphics/gnash: add KDE support, fix build with some option combinations X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2007 00:10:02 -0000 >Number: 117904 >Category: ports >Synopsis: [MAINTAINER] graphics/gnash: add KDE support, fix build with some option combinations >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 08 00:10:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.1-RELEASE-p20 i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #1: Tue Oct 23 05:28:10 MSD 2007 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: * Add KDE support - Konqueror plugin was confirmed to work * Change default renderer to AGG * Add patch to fix libintl-related build error when building without GTK GUI * Add IGNORE for Cairo+KDE case, as it's not supported by gnash >How-To-Repeat: >Fix: --- gnash.patch begins here --- diff -ruN gnash.orig/Makefile gnash/Makefile --- gnash.orig/Makefile Wed Oct 31 20:33:31 2007 +++ gnash/Makefile Wed Nov 7 23:42:12 2007 @@ -7,6 +7,7 @@ PORTNAME= gnash PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} @@ -43,22 +44,18 @@ MAN1= gnash.1 -# WITH_KDE option is untested - please uncomment related .if's below -# build gnash -DWITH_KDE -DWITH_PLUGIN. Check whether the plugin works -# and then contact the maintainer: plist and depends should be corrected OPTIONS= PLUGIN "Enable browser plugin" on \ CYGNAL "Enable Cygnal media server" off \ GTK "GUI: GTK (required for FF plugin)" on \ - AGG "Renderer: AGG" off \ - OPENGL "Renderer: OpenGL" on \ + KDE "GUI: KDE (required for Konqueror plugin)" off \ + AGG "Renderer: AGG" on \ + OPENGL "Renderer: OpenGL" off \ CAIRO "Renderer: Cairo (experimental)" off \ FFMPEG "Media handler: ffmpeg (+SDL sound output)" on \ GSTREAMER "Media handler: GStreamer" off \ MAD "Media handler: MAD (+SDL sound output)" off \ DEBUGLOG "Leave logfile in current directory on every run" off -# KDE "GUI: KDE (required for Konqueror plugin)" off \ - .include # Plugin option processing @@ -69,12 +66,12 @@ CONFIGURE_ARGS+= --disable-nsapi .endif -#.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN) -#PLIST_SUB+= KONQPLUGIN="" -#.else -#PLIST_SUB+= KONQPLUGIN="@comment " +.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN) +PLIST_SUB+= KONQPLUGIN="" +.else +PLIST_SUB+= KONQPLUGIN="@comment " CONFIGURE_ARGS+= --disable-kparts -#.endif +.endif # Cygnal option processing .if defined(WITH_CYGNAL) @@ -107,12 +104,19 @@ PLIST_SUB+= GTK="@comment " .endif -#.if defined(WITH_KDE) -#GNASH_GUIS+= kde -#PLIST_SUB+= KDE="" -#.else +.if defined(WITH_KDE) +GNASH_GUIS+= kde +PLIST_SUB+= KDE="" +# We have to use this lame way to depend on kdelibs, as USE_KDELIBS_VER won't +# work after bsd.port.pre.mk, and bsd.port.options.mk is unavailable until +# 5.5/6.2 EOL. We could also include bsd.kde.mk here, but that's much more +# likely to bring more trouble +LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3 +CONFIGURE_ARGS+=--with-qt-incl="${LOCALBASE}/include" \ + --with-qt-lib="${LOCALBASE}/lib" +.else PLIST_SUB+= KDE="@comment " -#.endif +.endif CONFIGURE_ARGS+= --enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,` @@ -129,6 +133,9 @@ . endif CONFIGURE_ARGS+= --enable-renderer=ogl .elif !defined(WITH_AGG) && !defined(WITH_OPENGL) && defined(WITH_CAIRO) +. if defined(WITH_KDE) +IGNORE= doesn't support Cairo renderer with KDE gui. Please rerun 'make config' and select different renderer or disable KDE GUI +. endif LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo CONFIGURE_ARGS+= --enable-renderer=cairo .else diff -ruN gnash.orig/files/patch-utilities-Makefile.in gnash/files/patch-utilities-Makefile.in --- gnash.orig/files/patch-utilities-Makefile.in Thu Jan 1 03:00:00 1970 +++ gnash/files/patch-utilities-Makefile.in Wed Nov 7 23:42:12 2007 @@ -0,0 +1,11 @@ +--- utilities/Makefile.in.orig 2007-08-29 15:03:59.000000000 +0000 ++++ utilities/Makefile.in 2007-11-07 20:37:02.000000000 +0000 +@@ -365,7 +365,7 @@ + $(top_builddir)/libbase/libgnashbase.la \ + $(top_builddir)/backend/libgnashbackend.la \ + $(top_builddir)/libamf/libgnashamf.la $(am__append_2) \ +- $(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS) ++ $(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS) $(INTLLIBS) + AM_LDFLAGS = \ + $(LIBADD_DL) \ + $(LIBLTDL) \ diff -ruN gnash.orig/pkg-plist gnash/pkg-plist --- gnash.orig/pkg-plist Wed Oct 31 20:33:31 2007 +++ gnash/pkg-plist Wed Nov 7 23:42:12 2007 @@ -2,8 +2,12 @@ bin/gparser bin/gprocessor %%GTK%%bin/gtk-gnash +%%KDE%%bin/kde-gnash %%CYGNAL%%bin/cygnal %%FFPLUGIN%%lib/browser_plugins/libgnashplugin.so +%%KONQPLUGIN%%lib/kde3/libklashpart.so +%%KONQPLUGIN%%lib/kde3/libklashpart.a +%%KONQPLUGIN%%lib/kde3/libklashpart.la lib/gnash/libgnashamf-0.8.1.so lib/gnash/libgnashamf.a lib/gnash/libgnashamf.la @@ -26,6 +30,9 @@ lib/gnash/libgnashserver.so %%DATADIR%%/GnashG.png %%DATADIR%%/gnash_128_96.ico +%%KONQPLUGIN%%share/apps/klash/pluginsinfo +%%KONQPLUGIN%%share/apps/klash/klashpartui.rc +%%KONQPLUGIN%%share/services/klash_part.desktop share/locale/cs/gnash.mo share/locale/de/gnash.mo share/locale/es/gnash.mo --- gnash.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: