Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=c9dcd01684bdbd8c92e9d68f82f8aa346ac2948c
commit c9dcd01684bdbd8c92e9d68f82f8aa346ac2948c
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sun Sep 21 13:12:33 2008 +0200
gnash-bzr9802-1bmf1-i686
- update to newer snapshot
- ungif.patch is now in upstream :)
diff --git a/source/xlib-extra/gnash/FrugalBuild
b/source/xlib-extra/gnash/FrugalBuild
index 491fe7f..7f72e75 100644
--- a/source/xlib-extra/gnash/FrugalBuild
+++ b/source/xlib-extra/gnash/FrugalBuild
@@ -5,12 +5,12 @@ USE_DEVEL=${USE_DEVEL:-"y"}
pkgname=gnash
pkgver=0.8.3
-Fuse $USE_DEVEL && pkgver=bzr9769
+Fuse $USE_DEVEL && pkgver=bzr9802
pkgrel=1bmf1
pkgdesc="A GNU Flash movie player."
url="http://www.gnu.org/software/gnash/";
depends=('sdl_mixer' 'cairo' 'libjpeg' 'libxml2' 'libmad' 'boost' 'agg' 'curl' \
- 'gtkglext' 'ffmpeg' 'libboost-mt')
+ 'gtkglext' 'ffmpeg>=svn15366' 'libboost-mt')
makedepends=('boost')
groups=('xlib-extra')
archs=('i686' 'x86_64' 'ppc')
@@ -20,7 +20,6 @@ if ! Fuse $USE_DEVEL; then
source=(http://ftp.gnu.org/pub/gnu/gnash/$pkgver/gnash-$pkgver.tar.bz2)
sha1sums=('3cd4a0930e772a42b0155295fca292fd94be7c42')
else
- source=(ungif.patch)
_F_scm_type="bzr"
_F_scm_url="http://bzr.savannah.gnu.org/r/gnash/trunk";
Finclude scm
@@ -32,14 +31,12 @@ build()
{
if Fuse $USE_DEVEL; then
Funpack_scm
- Fpatchall
sh autogen.sh || return 1
fi
Fmake --enable-mp3 --enable-plugin \
--with-plugindir=/usr/lib/mozilla/plugins --enable-gui=gtk \
--enable-visibility --enable-ffmpeg --enable-media=ffmpeg \
- --with-ffmpeg-incl=/usr/include --with-ungif-lib=/usr/lib \
- --with-ungif-incl=/usr/include
+ --with-ffmpeg-incl=/usr/include
Fmakeinstall install-plugin
}
diff --git a/source/xlib-extra/gnash/ungif.patch
b/source/xlib-extra/gnash/ungif.patch
deleted file mode 100644
index 6cf5f27..0000000
--- a/source/xlib-extra/gnash/ungif.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4e06a71..e465ddf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1530,7 +1530,7 @@ AC_SUBST(WINDRES)
- GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
- GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
- GNASH_PKG_FIND(libpng, [png.h], [png images], png_info_init)
--GNASH_PKG_FIND(gif, [gif_lib.h], [gif images], DGifOpen)
-+GNASH_PKG_FIND(ungif, [gif_lib.h], [gif images], DGifOpen)
- GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
-
- dnl Find freetype and fontconfig
-@@ -2393,15 +2393,15 @@ else
- echo " or .rpm users: yum install libjpeg-devel" >&3
- fi
-
--if test x"${GIF_LIBS}" != x ; then
-- if test x"${GIF_CFLAGS}" != x ; then
-- echo " GIF flags are: $GIF_CFLAGS"
-+if test x"${UNGIF_LIBS}" != x ; then
-+ if test x"${UNGIF_CFLAGS}" != x ; then
-+ echo " UNGIF flags are: $UNGIF_CFLAGS"
- else
-- echo " GIF flags are: default include path"
-+ echo " UNGIF flags are: default include path"
- fi
-- echo " GIF libs are: $GIF_LIBS"
-+ echo " UNGIF libs are: $UNGIF_LIBS"
- else
-- echo " ERROR: No GIF library development package installed!" >&3
-+ echo " ERROR: No UNGIF library development package installed!" >&3
- echo " Install it from
http://sourceforge.net/projects/giflib/"; >&3
- echo " or .deb users: apt-get install libungif-dev" >&3
- echo " or maybe : apt-get install libgif-dev" >&3
-diff --git a/libbase/Makefile.am b/libbase/Makefile.am
-index 7faeaca..05170ad 100644
---- a/libbase/Makefile.am
-+++ b/libbase/Makefile.am
-@@ -56,7 +56,7 @@ libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
- $(PTHREAD_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(LIBPNG_CFLAGS) \
-- $(GIF_CFLAG) \
-+ $(UNGIF_CFLAG) \
- $(GLIB_CFLAGS) \
- $(GSTREAMER_CFLAGS) \
- $(CURL_CFLAGS) \
-@@ -72,7 +72,7 @@ libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
- libgnashbase_la_LIBADD = \
- $(JPEG_LIBS) \
- $(LIBPNG_LIBS) \
-- $(GIF_LIBS) \
-+ $(UNGIF_LIBS) \
- $(Z_LIBS) \
- $(CURL_LIBS) \
- $(OPENGL_LIBS) \
-diff --git a/testsuite/misc-ming.all/Makefile.am
b/testsuite/misc-ming.all/Makefile.am
-index 62dc8db..17b8b31 100644
---- a/testsuite/misc-ming.all/Makefile.am
-+++ b/testsuite/misc-ming.all/Makefile.am
-@@ -64,7 +64,7 @@ AM_CPPFLAGS = \
- AM_LDFLAGS = \
- $(MING_LIBS) \
- $(OPENGL_LIBS) \
-- $(GIF_LIBS) \
-+ $(UNGIF_LIBS) \
- $(NULL)
-
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
