diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
| commit | 3282ccb6286f172872d887baf49e623c51e0a157 (patch) | |
| tree | 73ddd891395a089f724fd9cbcb95c6a28e1ffcce /community/gmerlin | |
| parent | f22839d3ad483a975a0c5955964bf257c0a0af6b (diff) | |
| parent | ddba9670c1518d9b420db6a6dca01a4a4a4136c7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox/PKGBUILD
community-testing/virtualbox/vbox-service.rc
community-testing/virtualbox/vboxdrv-reference.patch
core/cryptsetup/PKGBUILD
core/ed/PKGBUILD
core/module-init-tools/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
Diffstat (limited to 'community/gmerlin')
| -rw-r--r-- | community/gmerlin/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/gmerlin/libpng.patch | 17 |
2 files changed, 24 insertions, 4 deletions
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 5b71ad824..f0a9c65c5 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57805 2011-11-03 09:25:18Z spupykin $ +# $Id: PKGBUILD 58153 2011-11-07 10:55:45Z spupykin $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" @@ -15,15 +15,18 @@ optdepends=('alsa-lib: for ALSA support' 'libquicktime: for movie encoding' 'pulseaudio: for PulseAudio support' 'v4l-utils: for video conversion') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) options=('!libtool') -md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + libpng.patch) +md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' + 'c262023434246705296d97bc7337a212') build() { cd "$srcdir/$pkgname-$pkgver" rm -rf cpuinfo.sh + patch -p1 <$srcdir/libpng.patch ./configure --prefix=/usr --without-doxygen make } diff --git a/community/gmerlin/libpng.patch b/community/gmerlin/libpng.patch new file mode 100644 index 000000000..c01105e63 --- /dev/null +++ b/community/gmerlin/libpng.patch @@ -0,0 +1,17 @@ +diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c +--- gmerlin-1.0.0/plugins/png/ir_png.c 2011-01-07 18:37:06.000000000 +0300 ++++ gmerlin-1.0.0.my/plugins/png/ir_png.c 2011-11-07 14:46:25.000000000 +0400 +@@ -127,13 +127,8 @@ + bits = 16; + } + if(bit_depth < 8) +-#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9) +- png_set_gray_1_2_4_to_8(png->png_ptr); +-#else + png_set_expand_gray_1_2_4_to_8(png->png_ptr); +-#endif + +- png_set_gray_1_2_4_to_8(png->png_ptr); + if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS)) + { + png_set_tRNS_to_alpha(png->png_ptr); |