diff options
| -rw-r--r-- | libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch | 34 | ||||
| -rw-r--r-- | libre/mplayer-libre/PKGBUILD | 81 | ||||
| -rw-r--r-- | libre/mplayer-libre/include-samba-4.0.patch | 12 | ||||
| -rw-r--r-- | libre/mplayer-libre/mplayer.desktop | 1 |
4 files changed, 66 insertions, 62 deletions
diff --git a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch deleted file mode 100644 index c8a527cf3..000000000 --- a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@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 - diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 717b56af5..3f8b45dfe 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197402 2013-10-25 12:27:32Z giovanni $ +# $Id: PKGBUILD 198698 2013-11-02 08:09:59Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -7,33 +7,41 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=36285 -pkgrel=5 +pkgver=36498 +pkgrel=2 arch=('i686' 'x86_64') -makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' -'aalib' 'jack' 'libcaca' 'x264' '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' 'subversion') +makedepends=( + 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' + 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' + 'x264' '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' + ) license=('GPL') -url="http://www.mplayerhq.hu/" +url='http://www.mplayerhq.hu/' options=('!buildflags' '!emptydirs') source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz + http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2 mplayer.desktop cdio-includes.patch - 0001-demux_gif-declare-missing-PrintGifError.patch) -md5sums=('5e4f0d4d039b0219514cf52ae6da831d' - 'c0d6ef795cf6de48e3b87ff7c23f0319' + include-samba-4.0.patch) +md5sums=('8b856e8833d910b6e38b04bb8453d0dc' + '4ec1cedd4c7753512462f70b347c338a' + '62f44a58f072b2b1a3c3d3e4976d64b3' '7b5be7191aafbea64218dc4916343bbc' - '12a2a5b79849d57eab60a1bfec2978c4') + '868a92bdef148df7f38bfa992b26ce9d') prepare() { - cd "$srcdir/$_pkgbase-$pkgver" + cd $_pkgbase-$pkgver + patch -p0 -i ../cdio-includes.patch + patch -p1 -i ../include-samba-4.0.patch - patch -Np0 -i ../cdio-includes.patch - patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch + mv ../ffmpeg-2.1 ./ffmpeg } build() { - cd "$srcdir/$_pkgbase-$pkgver" + cd $_pkgbase-$pkgver ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -51,9 +59,10 @@ build() { --enable-xvmc \ --enable-radio \ --enable-radio-capture \ + --enable-smb \ --language=all \ --confdir=/etc/mplayer - [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak + [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak make } @@ -62,34 +71,50 @@ package_mplayer-libre() { pkgdesc="A movie player for GNU/Linux, without nonfree faac support" install=mplayer.install backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') - depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' - 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' - 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia') + depends=( + 'desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' + 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' + 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' + 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' + 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' + 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' + ) provides=("mplayer=$pkgver") replaces=('mplayer') conflicts=('mplayer') - cd "$srcdir/$_pkgbase-$pkgver" - + cd $_pkgbase-$pkgver make DESTDIR="$pkgdir" install-mplayer install-mplayer-man - install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" + + 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" + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf \ + "$pkgdir/usr/share/mplayer/subfont.ttf" rm -rf "$pkgdir/usr/share/mplayer/font" + #desktop file FS#14770 - install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop" - install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" + install -Dm644 "$srcdir/mplayer.desktop" \ + "$pkgdir/usr/share/applications/mplayer.desktop" + install -Dm644 etc/mplayer256x256.png \ + "$pkgdir/usr/share/pixmaps/mplayer.png" } package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree faac support" - depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' - 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis') + depends=( + 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' + 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' + 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' + 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' + 'libvorbis' 'opus' + ) provides=("mencoder=$pkgver") replaces=('mencoder') conflicts=('mencoder') - cd "$srcdir/$_pkgbase-$pkgver" + cd $_pkgbase-$pkgver make DESTDIR="$pkgdir" install-mencoder install-mencoder-man find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } diff --git a/libre/mplayer-libre/include-samba-4.0.patch b/libre/mplayer-libre/include-samba-4.0.patch new file mode 100644 index 000000000..2ed272b6a --- /dev/null +++ b/libre/mplayer-libre/include-samba-4.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c +--- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000 ++++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000 +@@ -18,7 +18,7 @@ + + #include "config.h" + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <unistd.h> + + #include "mp_msg.h" diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop index 07acea13f..946b8e345 100644 --- a/libre/mplayer-libre/mplayer.desktop +++ b/libre/mplayer-libre/mplayer.desktop @@ -19,3 +19,4 @@ Terminal=false NoDisplay=true Categories=GTK;AudioVideo;Audio;Video;Player;TV; MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska; +X-KDE-Protocols=http,ftp,smb |