Date: Friday, March 14, 2014 @ 01:14:28 Author: heftig Revision: 107172
0.8.11dev snapshot Modified: gnash/trunk/PKGBUILD Deleted: gnash/trunk/gnash-0.8.10-boost-1.50.patch gnash/trunk/gnucash-0.8.10-giflib-5.0.patch ---------------------------------+ PKGBUILD | 42 ++++++++++++++++---------------------- gnash-0.8.10-boost-1.50.patch | 12 ---------- gnucash-0.8.10-giflib-5.0.patch | 12 ---------- 3 files changed, 18 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-13 23:44:01 UTC (rev 107171) +++ PKGBUILD 2014-03-14 00:14:28 UTC (rev 107172) @@ -3,36 +3,32 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) -pkgver=0.8.10 -pkgrel=11 +pkgver=0.8.11dev +pkgrel=1 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/"; license=(GPL3) makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu - speex fontconfig - gstreamer0.10-base + speex fontconfig ffmpeg jemalloc gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext - pkgconfig boost) + pkgconfig boost git) options=(!emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - nodebug.patch gnash-0.8.10-boost-1.50.patch gnucash-0.8.10-giflib-5.0.patch) -sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' - '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551' - 'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c' - 'd1597ce496d95913a7d5873a0a3c58e4f40fa4ec6e3fc7ae939a66f1362b3e57') +source=('gnash::git://git.sv.gnu.org/gnash.git#commit=a3180f2' + nodebug.patch) +sha256sums=('SKIP' + '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') -build() { - cd gnash-$pkgver +prepare() { + cd gnash # Disable very, very verbose debugging (gigabytes of logs) patch -Np1 -i ../nodebug.patch - # Link to libboost_system.so - patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch + ./autogen.sh +} - patch -Np1 -i ../gnucash-0.8.10-giflib-5.0.patch - - ./autogen.sh +build() { + cd gnash ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -39,7 +35,7 @@ --with-plugins-install=system \ --with-npapi-plugindir=/usr/lib/mozilla/plugins \ --enable-gui=sdl,gtk,dump \ - --enable-media=gst \ + --enable-media=ffmpeg \ --enable-renderer=all \ --enable-device=x11 @@ -51,13 +47,11 @@ package_gnash-common() { pkgdesc="A GNU Flash movie player" depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu - speex fontconfig cairo - gstreamer0.10-base + speex fontconfig cairo ffmpeg jemalloc boost-libs) backup=(etc/gnashrc etc/gnashthumbnailrc) - cd gnash-$pkgver - + cd gnash make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install # Split gnash-gtk @@ -79,7 +73,7 @@ mv gtk/* "$pkgdir" - cd gnash-$pkgver + cd gnash make DESTDIR="$pkgdir" install-plugin install -m755 -d "$pkgdir/usr/share/gconf/schemas" Deleted: gnash-0.8.10-boost-1.50.patch =================================================================== --- gnash-0.8.10-boost-1.50.patch 2014-03-13 23:44:01 UTC (rev 107171) +++ gnash-0.8.10-boost-1.50.patch 2014-03-14 00:14:28 UTC (rev 107172) @@ -1,12 +0,0 @@ -diff -u -r gnash-0.8.10/macros/boost.m4 gnash-0.8.10-boost1.50/macros/boost.m4 ---- gnash-0.8.10/macros/boost.m4 2012-01-19 20:17:49.000000000 +0100 -+++ gnash-0.8.10-boost-1.50/macros/boost.m4 2012-07-11 10:56:11.089137186 +0200 -@@ -37,7 +37,7 @@ - boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp" - dnl this is a list of *required* libraries. If any of these are missing, this - dnl test will return a failure, and Gnash won't build. -- boost_libs="thread program_options iostreams" -+ boost_libs="thread program_options iostreams system" - - dnl this is a list of *recommended* libraries. If any of these are missing, this - dnl test will return a warning, and Gnash will build, but testing won't work. Deleted: gnucash-0.8.10-giflib-5.0.patch =================================================================== --- gnucash-0.8.10-giflib-5.0.patch 2014-03-13 23:44:01 UTC (rev 107171) +++ gnucash-0.8.10-giflib-5.0.patch 2014-03-14 00:14:28 UTC (rev 107172) @@ -1,12 +0,0 @@ -diff -rupN a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp ---- a/libbase/GnashImageGif.cpp 2012-01-19 19:17:48.000000000 +0000 -+++ b/libbase/GnashImageGif.cpp 2013-07-30 09:08:37.707930583 +0000 -@@ -269,7 +269,7 @@ GifInput::processRecord(GifRecordType re - void - GifInput::read() - { -- _gif = DGifOpen(_inStream.get(), &readData); -+ _gif = DGifOpen(_inStream.get(), &readData, NULL); - - GifRecordType record; -
