diff options
Diffstat (limited to 'testing/gnash')
| -rw-r--r-- | testing/gnash/APKBUILD | 74 | ||||
| -rw-r--r-- | testing/gnash/aslr-fix.patch | 52 | ||||
| -rw-r--r-- | testing/gnash/gnash-ffmpeg.patch | 24 |
3 files changed, 0 insertions, 150 deletions
diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD deleted file mode 100644 index 432bbd652f..0000000000 --- a/testing/gnash/APKBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: William Pitcock <nenolod@dereferenced.org> -pkgname=gnash -pkgver=0.8.10 -pkgrel=2 -pkgdesc="GNU flash player implementation" -url="http://www.gnashdev.org/" -arch="all" -license="GPL" -depends= -depends_dev="agg-dev cairo-dev gstreamer-dev gst-plugins-base-dev - mesa-dev gtk+-dev sdl-dev boost-dev giflib-dev - speex-dev libxml2-dev jpeg-dev xulrunner-dev gtkglext-dev - curl-dev libxmu-dev libx11-dev" -makedepends="$depends_dev libtool" -install="" -subpackages="$pkgname-doc $pkgname-dev $pkgname-mozilla $pkgname-sdl - $pkgname-fb $pkgname-lang" -source="http://ftp.gnu.org/pub/gnu/gnash/$pkgver/gnash-$pkgver.tar.bz2 - gnash-ffmpeg.patch - aslr-fix.patch" - -_builddir="$srcdir"/gnash-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --enable-media=gst \ - --without-gconf \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - rm "$pkgdir"/usr/lib/gnash/*.la || return 1 -} - -sdl() { - pkgdesc="$pkgdesc (sdl player)" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/sdl-gnash "$subpkgdir"/usr/bin -} - -fb() { - pkgdesc="$pkgdesc (framebuffer player)" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/fb-gnash "$subpkgdir"/usr/bin -} - -mozilla() { - depends="gnash" - pkgdesc="$pkgdesc (mozilla plugin)" - mkdir -p "$subpkgdir"/usr/lib/mozilla/plugins - mv "$_builddir"/plugin/npapi/.libs/libgnashplugin.so "$subpkgdir"/usr/lib/mozilla/plugins -} - -md5sums="63e9f79c41d93d48c5a2fa94856548c4 gnash-0.8.10.tar.bz2 -b324b3fee1e017d8fcc4d991146266f8 gnash-ffmpeg.patch -64cea4c0b4963b7fd5308beb1b20fed6 aslr-fix.patch" diff --git a/testing/gnash/aslr-fix.patch b/testing/gnash/aslr-fix.patch deleted file mode 100644 index 632443b602..0000000000 --- a/testing/gnash/aslr-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Naur gnash-0.8.10.alt/libbase/jemalloc.c gnash-0.8.10/libbase/jemalloc.c ---- gnash-0.8.10.alt/libbase/jemalloc.c 2012-02-07 09:39:41.000000000 +0100 -+++ gnash-0.8.10/libbase/jemalloc.c 2012-02-24 18:36:47.000000000 +0100 -@@ -429,7 +429,7 @@ - static const bool __isthreaded = true; - #endif - --#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) -+#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) || defined(MOZ_MEMORY_LINUX) - #define JEMALLOC_USES_MAP_ALIGN /* Required on Solaris 10. Might improve performance elsewhere. */ - #endif - -@@ -2238,6 +2238,7 @@ - * We don't use MAP_FIXED here, because it can cause the *replacement* - * of existing mappings, and we only want to create new mappings. - */ -+#ifndef MOZ_MEMORY_LINUX - #ifdef MALLOC_PAGEFILE - if (pfd != -1) { - ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | -@@ -2252,6 +2253,31 @@ - - if (ret == MAP_FAILED) - ret = NULL; -+#else /* MOZ_MEMORY_LINUX */ -+#ifdef MALLOC_PAGEFILE -+ if (pfd != -1) { -+ ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | -+ MAP_NOSYNC, pfd, 0); -+ } else -+#endif -+ { -+ ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE | -+ MAP_NOSYNC | MAP_ANON, -1, 0); -+ } -+ assert(ret != NULL); -+ -+ if (ret == MAP_FAILED) -+ return NULL; -+ -+ uintptr_t aligned_ret; -+ size_t extra_size; -+ aligned_ret = (uintptr_t)ret + alignment - 1; -+ aligned_ret &= ~(alignment - 1); -+ extra_size = aligned_ret - (uintptr_t)ret; -+ munmap(ret, extra_size); -+ munmap(ret + extra_size + size, alignment - extra_size); -+ ret = (void*)aligned_ret; -+#endif /* ifndef MOZ_MEMORY_LINUX*/ - return (ret); - } - #endif diff --git a/testing/gnash/gnash-ffmpeg.patch b/testing/gnash/gnash-ffmpeg.patch deleted file mode 100644 index dc78e81c59..0000000000 --- a/testing/gnash/gnash-ffmpeg.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gnash-0.8.9.orig/libmedia/ffmpeg/MediaParserFfmpeg.cpp -+++ gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp -@@ -52,8 +52,8 @@ - return p->readPacket(buf, buf_size); - } - --boost::int64_t --MediaParserFfmpeg::seekMediaWrapper(void *opaque, boost::int64_t offset, int whence) -+::int64_t -+MediaParserFfmpeg::seekMediaWrapper(void *opaque, ::int64_t offset, int whence) - { - MediaParserFfmpeg* p = static_cast<MediaParserFfmpeg*>(opaque); - return p->seekMedia(offset, whence); ---- gnash-0.8.9.orig/libmedia/ffmpeg/MediaParserFfmpeg.h -+++ gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.h -@@ -126,7 +126,7 @@ - boost::int64_t seekMedia(boost::int64_t offset, int whence); - - /// ffmpeg callback function -- static boost::int64_t seekMediaWrapper(void *opaque, boost::int64_t offset, int whence); -+ static int64_t seekMediaWrapper(void *opaque, int64_t offset, int whence); - - /// Read some of the input to figure an AVInputFormat - AVInputFormat* probeStream(); |