[arch-commits] Commit in mplayer2/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Sun Jul 14 09:01:02 UTC 2013
Date: Sunday, July 14, 2013 @ 11:01:02
Author: bpiotrowski
Revision: 94078
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
mplayer2/repos/community-staging-i686/
mplayer2/repos/community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch
(from rev 94077, mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch)
mplayer2/repos/community-staging-i686/PKGBUILD
(from rev 94077, mplayer2/trunk/PKGBUILD)
mplayer2/repos/community-staging-i686/mplayer2.install
(from rev 94077, mplayer2/trunk/mplayer2.install)
mplayer2/repos/community-staging-x86_64/
mplayer2/repos/community-staging-x86_64/0001-demux_gif-declare-missing-PrintGifError.patch
(from rev 94077, mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch)
mplayer2/repos/community-staging-x86_64/PKGBUILD
(from rev 94077, mplayer2/trunk/PKGBUILD)
mplayer2/repos/community-staging-x86_64/mplayer2.install
(from rev 94077, mplayer2/trunk/mplayer2.install)
-----------------------------------------------------------------------------+
community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch | 34 +++++
community-staging-i686/PKGBUILD | 66 ++++++++++
community-staging-i686/mplayer2.install | 11 +
community-staging-x86_64/0001-demux_gif-declare-missing-PrintGifError.patch | 34 +++++
community-staging-x86_64/PKGBUILD | 66 ++++++++++
community-staging-x86_64/mplayer2.install | 11 +
6 files changed, 222 insertions(+)
Copied: mplayer2/repos/community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch (from rev 94077, mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch)
===================================================================
--- community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch (rev 0)
+++ community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch 2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,34 @@
+From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
+Date: Sun, 14 Jul 2013 10:51:11 +0200
+Subject: [PATCH] demux_gif: declare missing PrintGifError
+
+Apparently it has been removed from newer Giflib releases.
+---
+ libmpdemux/demux_gif.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
+index eee7a85..3d761c0 100644
+--- a/libmpdemux/demux_gif.c
++++ b/libmpdemux/demux_gif.c
+@@ -44,6 +44,16 @@ typedef struct {
+
+ #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
+
++static void PrintGifError(void)
++{
++ char *Err = GifErrorString();
++
++ if (Err != NULL)
++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
++ else
++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
++}
++
+ #ifndef CONFIG_GIF_TVT_HACK
+ // not supported by certain versions of the library
+ static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
+--
+1.8.3.2
+
Copied: mplayer2/repos/community-staging-i686/PKGBUILD (from rev 94077, mplayer2/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Martin Panter <vadmium+aur at gmail.com>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=mplayer2
+pkgver=20130428
+pkgrel=2
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.mplayer2.org/'
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg'
+ 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
+ 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread'
+ 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
+ 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils' 'git')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+options=(!emptydirs)
+source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa
+ 0001-demux_gif-declare-missing-PrintGifError.patch)
+sha256sums=('SKIP'
+ 'f5442289fee5eaf3c86c28cc5cbf2af8e85c6ccfdc9c2a73c71aa22efb7cdf09')
+
+pkgver() {
+ cd $pkgname
+ git log -1 --format="%cd" --date=short | sed 's|-||g'
+}
+
+prepare() {
+ cd $pkgname
+ sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
+ find -type f -exec sed -e 's/python3/python/' -i {} \;
+ patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
+}
+
+build() {
+ cd $pkgname
+
+ ./configure --prefix=/usr --confdir=/etc/mplayer \
+ --enable-translation --language=all \
+ --enable-runtime-cpudetection \
+ --enable-joystick \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
+ install -dm755 $pkgdir/usr/share/mplayer/
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
+
+ install -dm755 $pkgdir/usr/share/applications/
+ install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
+}
Copied: mplayer2/repos/community-staging-i686/mplayer2.install (from rev 94077, mplayer2/trunk/mplayer2.install)
===================================================================
--- community-staging-i686/mplayer2.install (rev 0)
+++ community-staging-i686/mplayer2.install 2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mplayer2/repos/community-staging-x86_64/0001-demux_gif-declare-missing-PrintGifError.patch (from rev 94077, mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch)
===================================================================
--- community-staging-x86_64/0001-demux_gif-declare-missing-PrintGifError.patch (rev 0)
+++ community-staging-x86_64/0001-demux_gif-declare-missing-PrintGifError.patch 2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,34 @@
+From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
+Date: Sun, 14 Jul 2013 10:51:11 +0200
+Subject: [PATCH] demux_gif: declare missing PrintGifError
+
+Apparently it has been removed from newer Giflib releases.
+---
+ libmpdemux/demux_gif.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
+index eee7a85..3d761c0 100644
+--- a/libmpdemux/demux_gif.c
++++ b/libmpdemux/demux_gif.c
+@@ -44,6 +44,16 @@ typedef struct {
+
+ #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
+
++static void PrintGifError(void)
++{
++ char *Err = GifErrorString();
++
++ if (Err != NULL)
++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
++ else
++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
++}
++
+ #ifndef CONFIG_GIF_TVT_HACK
+ // not supported by certain versions of the library
+ static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
+--
+1.8.3.2
+
Copied: mplayer2/repos/community-staging-x86_64/PKGBUILD (from rev 94077, mplayer2/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Martin Panter <vadmium+aur at gmail.com>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=mplayer2
+pkgver=20130428
+pkgrel=2
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.mplayer2.org/'
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg'
+ 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
+ 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread'
+ 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
+ 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils' 'git')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+options=(!emptydirs)
+source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa
+ 0001-demux_gif-declare-missing-PrintGifError.patch)
+sha256sums=('SKIP'
+ 'f5442289fee5eaf3c86c28cc5cbf2af8e85c6ccfdc9c2a73c71aa22efb7cdf09')
+
+pkgver() {
+ cd $pkgname
+ git log -1 --format="%cd" --date=short | sed 's|-||g'
+}
+
+prepare() {
+ cd $pkgname
+ sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
+ find -type f -exec sed -e 's/python3/python/' -i {} \;
+ patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
+}
+
+build() {
+ cd $pkgname
+
+ ./configure --prefix=/usr --confdir=/etc/mplayer \
+ --enable-translation --language=all \
+ --enable-runtime-cpudetection \
+ --enable-joystick \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
+ install -dm755 $pkgdir/usr/share/mplayer/
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
+
+ install -dm755 $pkgdir/usr/share/applications/
+ install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
+}
Copied: mplayer2/repos/community-staging-x86_64/mplayer2.install (from rev 94077, mplayer2/trunk/mplayer2.install)
===================================================================
--- community-staging-x86_64/mplayer2.install (rev 0)
+++ community-staging-x86_64/mplayer2.install 2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list