[Gsrc-commit] /srv/bzr/gsrc/trunk r1186: clean up gnash, but build fails

[Brandon Invergo]

------------------------------------------------------------
revno: 1186
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-17 19:24:07 +0100
message:
  clean up gnash, but build fails
added:
  gnu/gnash/config.mk
modified:
  TODO
  gnu/gnash/Makefile

=== modified file 'TODO'
--- a/TODO      2012-11-17 12:23:32 +0000
+++ b/TODO      2012-11-17 18:24:07 +0000
@@ -133,3 +133,4 @@
 ** libxmi: old libtool problems
 ** maverik: very inflexible Makefile should be replaced
 ** metahtml: build mysteriously fails
+** gnash: dependency hell (gstreamer)

=== modified file 'gnu/gnash/Makefile'
--- a/gnu/gnash/Makefile        2012-11-06 08:26:27 +0000
+++ b/gnu/gnash/Makefile        2012-11-17 18:24:07 +0000
@@ -1,23 +1,28 @@
 GARNAME = gnash
 GARVERSION = 0.8.10
+HOME_URL = http://www.gnu.org/software/gnash/
+DESCRIPTION = GNU Flash movie player
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnash/$(GARVERSION)/
-
+MASTER_SUBDIR = $(GARNAME)/$(GARVERSION)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
 
 LIBDEPS = 
-LIBDEPS = boost zlib libpng #gtk pango atk cairo netcat zlib jpeg libpng 
freetype2 fontconfig libxml2 expat gstreamer gst-plugins-base agg curl boost 
glib sdl giflib speex
-#TESTDEPS = dejagnu
+LIBDEPS = boost zlib libpng gtk2 pango atk cairo zlib libpng glib  \
+         libsdl libxml2 curl # netcat freetype2 fontconfig expat \
+         gstreamer gst-plugins-base agg giflib speex jpeg
 
-HOME_URL = http://www.gnu.org/software/gnash/
-DESCRIPTION = GNU Flash movie player
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
 
-CONFIGURE_OPTS = --enable-gui=gtk --enable-media=GST 
--with-libiconv-prefix=$(prefix) \
-                --with-boost-incl=$(prefix)/include 
--with-boost-lib=$(prefix)/lib
+CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) \
+                 --with-boost-incl=$(prefix)/include \
+                 --with-boost-lib=$(prefix)/lib
 
 pre-configure:
        @sed -i -e 's/\(^BOOST_LIBS = @address@hidden)/\1 -lboost_system/' 
$(WORKSRC)/Makefile.in

=== added file 'gnu/gnash/config.mk'
--- a/gnu/gnash/config.mk       1970-01-01 00:00:00 +0000
+++ b/gnu/gnash/config.mk       2012-11-17 18:24:07 +0000
@@ -0,0 +1,4 @@
+## Configuration options for gnash ##
+
+CONFIGURE_OPTS ?= --enable-gui=gtk --enable-media=GST --without-gconf
+BUILD_OPTS ?=