From 2783a19b96772315a398434282882fa5bc3bd9a0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 6 May 2016 21:20:39 -0300
Subject: mplayer-37857-1.parabola1: updating version

---
 libre/mplayer/PKGBUILD            | 29 ++++++++++++--------------
 libre/mplayer/cdio-includes.patch | 43 ---------------------------------------
 libre/mplayer/mplayer.install     | 11 ----------
 3 files changed, 13 insertions(+), 70 deletions(-)
 delete mode 100644 libre/mplayer/cdio-includes.patch
 delete mode 100644 libre/mplayer/mplayer.install

(limited to 'libre')

diff --git a/libre/mplayer/PKGBUILD b/libre/mplayer/PKGBUILD
index 76f74a62f..e571c5aab 100644
--- a/libre/mplayer/PKGBUILD
+++ b/libre/mplayer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 258706 2016-01-30 18:20:43Z bpiotrowski $
+# $Id: PKGBUILD 266899 2016-05-04 21:39:36Z arojas $
 # Maintainer (Arch):  Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor (Arch): Hugo Doria <hugo@archlinux.org>
@@ -7,8 +7,8 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=37379
-pkgrel=7.parabola1
+pkgver=37857
+pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -17,15 +17,13 @@ makedepends=(
   'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
   'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
   'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls'
-  'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav'
+  'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg'
 )
 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.6.7.tar.bz2
         mplayer.desktop
-        cdio-includes.patch
         include-samba-4.0.patch
         ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
         revert-icl-fixes.patch
@@ -39,19 +37,18 @@ md5sums=('SKIP'
          '3579402002b7302fdf2d146639333efd'
          '9131fa5229c857174ab029ed9b0cb71b')
 
-pkgver() {
-  cd $pkgbase-$pkgver
-  svnversion
-}
+#pkgver() {
+#  cd $pkgbase-$pkgver
+#  svnversion
+#}
 
 prepare() {
   cd $pkgbase-$pkgver
-  mv ../ffmpeg-*/ ./ffmpeg
+#  mv ../ffmpeg-*/ ./ffmpeg
 
-  patch -Np0 -i ../cdio-includes.patch
   patch -Np1 -i ../include-samba-4.0.patch
   patch -Np0 -i ../revert-icl-fixes.patch
-  patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+#  patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
   # fix ffmpeg/libav linkage for ARM
   patch -p0 -i ../37386.patch
 
@@ -80,6 +77,7 @@ build() {
     --disable-faac \
     --disable-unrarexec \
     --disable-cdparanoia \
+    --disable-ffmpeg_a \
     --enable-xvmc \
     --enable-radio \
     --enable-radio-capture \
@@ -94,7 +92,6 @@ build() {
 
 package_mplayer() {
   pkgdesc='Media player for GNU/Linux, without using of UnRAR executable and nonfree faac support'
-  install=mplayer.install
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
   depends=(
     'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
@@ -103,7 +100,7 @@ package_mplayer() {
     'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
     'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
     'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump'
-    'gsm' 'gnutls' 'libdvdnav'
+    'gsm' 'gnutls' 'libdvdnav' 'ffmpeg'
   )
   replaces=('mplayer-libre' 'mplayer-parabola')
   conflicts=('mplayer-libre' 'mplayer-parabola')
@@ -128,7 +125,7 @@ package_mencoder() {
     'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
     'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2'
     'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
-    'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav'
+    'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav' 'ffmpeg'
   )
   replaces=('mencoder-libre' 'mencoder-parabola')
   conflicts=('mencoder-libre' 'mencoder-parabola')
diff --git a/libre/mplayer/cdio-includes.patch b/libre/mplayer/cdio-includes.patch
deleted file mode 100644
index f71472812..000000000
--- a/libre/mplayer/cdio-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
- 
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/libre/mplayer/mplayer.install b/libre/mplayer/mplayer.install
deleted file mode 100644
index 660593cf5..000000000
--- a/libre/mplayer/mplayer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
-- 
cgit v1.2.3