Bug 146551

Summary: [patch] x11-toolkits/wxgtk28: move gstreamer and mspack to OPTIONS
Product: Ports & Packages Reporter: swell.k <swell.k>
Component: Individual Port(s)Assignee: Max Khon <fjoe>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
a.diff none

Description swell.k 2010-05-13 19:40:01 UTC 
Some apps like mkvmerge (multimedia/mkvtoolnix) don't need them.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-05-13 19:40:11 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->fjoe

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 swell.k 2010-05-17 13:07:44 UTC 
Oops, we don't need gconf2 without gstreamer according to configure.in.

  if test "$wxUSE_MEDIACTRL" = "yes"; then
  ...
          if test "$wxUSE_GSTREAMER8" = "no"; then
              PKG_CHECK_MODULES(GST,
                  [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0],

--- a.diff begins here ---
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 23c62e0..89e4ade 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -26,7 +26,7 @@ USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_GNOME=	gtk20 gconf2
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-libjpeg=sys\
@@ -55,6 +55,7 @@ OPTIONS=	GSTREAMER "media support" on \
 
 .if defined(WITH_GSTREAMER)
 CONFIGURE_ARGS+=--enable-mediactrl
+USE_GNOME+=	gconf2
 USE_GSTREAMER=	yes
 PLIST_SUB+=     GSTREAMER=""
 .else
--- a.diff ends here ---
Comment 3 swell.k 2010-05-19 19:41:56 UTC 
missing piece
--- a.diff begins here ---
Index: x11-toolkits/wxgtk28-unicode/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/x11-toolkits/wxgtk28-unicode/pkg-plist,v
retrieving revision 1.11
diff -u -p -r1.11 pkg-plist
--- x11-toolkits/wxgtk28-unicode/pkg-plist	19 Mar 2009 19:56:38 -0000	1.11
+++ x11-toolkits/wxgtk28-unicode/pkg-plist	17 May 2010 12:28:36 -0000
@@ -24,9 +24,9 @@ lib/libwx_gtk2u_gl-2.8.so.0.6.0
 lib/libwx_gtk2u_html-2.8.so
 lib/libwx_gtk2u_html-2.8.so.0
 lib/libwx_gtk2u_html-2.8.so.0.6.0
-lib/libwx_gtk2u_media-2.8.so
-lib/libwx_gtk2u_media-2.8.so.0
-lib/libwx_gtk2u_media-2.8.so.0.6.0
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0.6.0
 lib/libwx_gtk2u_qa-2.8.so
 lib/libwx_gtk2u_qa-2.8.so.0
 lib/libwx_gtk2u_qa-2.8.so.0.6.0
--- a.diff ends here ---
Comment 4 Max Khon freebsd_committer freebsd_triage 2010-08-02 12:52:16 UTC 
State Changed
From-To: open->closed

Patch committed, thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-08-02 12:52:18 UTC 
fjoe        2010-08-02 11:52:04 UTC

  FreeBSD ports repository

  Modified files:
    x11-toolkits/wxgtk28 Makefile pkg-plist 
  Log:
  Move gstreamer and mspack to OPTIONS.
  
  PR:             146551
  Submitted by:   Anonymous <swell.k@gmail.com>
  
  Revision  Changes    Path
  1.55      +25 -5     ports/x11-toolkits/wxgtk28/Makefile
  1.12      +3 -3      ports/x11-toolkits/wxgtk28/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"