[arch-commits] Commit in mplayer/trunk (PKGBUILD giflib51.patch)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sun Dec 28 09:26:46 UTC 2014


    Date: Sunday, December 28, 2014 @ 10:26:46
  Author: bpiotrowski
Revision: 228110

upgpkg: mplayer 37344-1

new upstream release

Modified:
  mplayer/trunk/PKGBUILD
Deleted:
  mplayer/trunk/giflib51.patch

----------------+
 PKGBUILD       |   18 ++++++++----------
 giflib51.patch |   24 ------------------------
 2 files changed, 8 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-28 09:09:17 UTC (rev 228109)
+++ PKGBUILD	2014-12-28 09:26:46 UTC (rev 228110)
@@ -5,8 +5,8 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=37224
-pkgrel=3
+pkgver=37344
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -14,24 +14,23 @@
   'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
   'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
   'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
-  'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gsm'
+  'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls'
+  'gsm'
 )
 license=('GPL')
 url='http://www.mplayerhq.hu/'
 options=('!buildflags' '!emptydirs')
 source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
-        http://ffmpeg.org/releases/ffmpeg-2.2.10.tar.bz2
+        http://ffmpeg.org/releases/ffmpeg-2.5.2.tar.bz2
         mplayer.desktop
         cdio-includes.patch
         include-samba-4.0.patch
-        giflib51.patch
         revert-icl-fixes.patch)
 md5sums=('SKIP'
-         'f40a829f5075c8ee901e5dbc6d40c209'
+         '308d49d91752ac00ded9483ebaab849d'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d'
-         '14461fb94b7aa5dda091ba4f737df2d9'
          '3579402002b7302fdf2d146639333efd')
 
 pkgver() {
@@ -41,11 +40,10 @@
 
 prepare() {
   cd $pkgbase-$pkgver
-  mv ../ffmpeg-2.2.10 ./ffmpeg
+  mv ../ffmpeg-*/ ./ffmpeg
 
   patch -p0 -i ../cdio-includes.patch
   patch -p1 -i ../include-samba-4.0.patch
-  patch -Np0 -i ../giflib51.patch
   patch -Np0 -i ../revert-icl-fixes.patch
 
   ./version.sh
@@ -89,7 +87,7 @@
     'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
     'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
     'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump'
-    'gsm'
+    'gsm' 'gnutls'
   )
 
   cd $pkgbase-$pkgver

Deleted: giflib51.patch
===================================================================
--- giflib51.patch	2014-12-28 09:09:17 UTC (rev 228109)
+++ giflib51.patch	2014-12-28 09:26:46 UTC (rev 228110)
@@ -1,24 +0,0 @@
---- libvo/vo_gif89a.c.orig	2014-06-11 10:06:29.243216331 +0000
-+++ libvo/vo_gif89a.c	2014-06-11 10:08:37.346078847 +0000
-@@ -75,6 +75,9 @@
- #define MakeMapObject GifMakeMapObject
- #define FreeMapObject GifFreeMapObject
- #define QuantizeBuffer GifQuantizeBuffer
-+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
-+#define EGifCloseFile(a) EGifCloseFile(a, NULL)
-+#endif
- #endif
- 
- // how many frames per second we are aiming for during output.
---- libmpdemux/demux_gif.c.orig	2014-06-11 10:46:48.120883788 +0000
-+++ libmpdemux/demux_gif.c	2014-06-11 10:47:28.290732272 +0000
-@@ -50,6 +50,9 @@
- #define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL)
- #define GifError() (gif ? gif->Error : 0)
- #define GifErrorString() GifErrorString(gif->Error)
-+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
-+#define DGifCloseFile(a) DGifCloseFile(a, NULL)
-+#endif
- #endif
- 
- /* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */



More information about the arch-commits mailing list