[arch-commits] Commit in mplayer/trunk (4 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Thu Oct 31 21:37:06 UTC 2013
Date: Thursday, October 31, 2013 @ 22:37:05
Author: bpiotrowski
Revision: 198646
upgpkg: mplayer 36498-2
- enable opus
- fix samba support
- add stream support for KDE to desktop file
Added:
mplayer/trunk/include-samba-4.0.patch
Modified:
mplayer/trunk/PKGBUILD
mplayer/trunk/mplayer.desktop
Deleted:
mplayer/trunk/0001-demux_gif-declare-missing-PrintGifError.patch
----------------------------------------------------+
0001-demux_gif-declare-missing-PrintGifError.patch | 34 ----------
PKGBUILD | 64 +++++++++++++------
include-samba-4.0.patch | 12 +++
mplayer.desktop | 1
4 files changed, 58 insertions(+), 53 deletions(-)
Deleted: 0001-demux_gif-declare-missing-PrintGifError.patch
===================================================================
--- 0001-demux_gif-declare-missing-PrintGifError.patch 2013-10-31 18:54:26 UTC (rev 198645)
+++ 0001-demux_gif-declare-missing-PrintGifError.patch 2013-10-31 21:37:05 UTC (rev 198646)
@@ -1,34 +0,0 @@
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-31 18:54:26 UTC (rev 198645)
+++ PKGBUILD 2013-10-31 21:37:05 UTC (rev 198646)
@@ -5,11 +5,16 @@
pkgbase=mplayer
pkgname=('mplayer' 'mencoder')
pkgver=36498
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' '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' 'subversion')
+makedepends=(
+ 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+ 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+ 'x264' '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'
+ )
license=('GPL')
url="http://www.mplayerhq.hu/"
options=('!buildflags' '!emptydirs')
@@ -16,15 +21,19 @@
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)
+ cdio-includes.patch
+ include-samba-4.0.patch)
md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
'4ec1cedd4c7753512462f70b347c338a'
- 'c0d6ef795cf6de48e3b87ff7c23f0319'
- '7b5be7191aafbea64218dc4916343bbc')
+ '62f44a58f072b2b1a3c3d3e4976d64b3'
+ '7b5be7191aafbea64218dc4916343bbc'
+ '868a92bdef148df7f38bfa992b26ce9d')
prepare() {
cd $pkgbase-$pkgver
- patch -Np0 -i ../cdio-includes.patch
+ patch -p0 -i ../cdio-includes.patch
+ patch -p1 -i ../include-samba-4.0.patch
+
mv ../ffmpeg-2.1 ./ffmpeg
}
@@ -47,9 +56,10 @@
--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
}
@@ -58,26 +68,42 @@
pkgdesc="A movie player for linux"
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' 'faac' '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' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+ 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
+ )
cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
- 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() {
pkgdesc="Free command line video decoding, encoding and filtering tool"
- depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
- 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' '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' 'faac' 'faad2'
+ 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+ 'libvorbis' 'opus'
+ )
cd $pkgbase-$pkgver
make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
Added: include-samba-4.0.patch
===================================================================
--- include-samba-4.0.patch (rev 0)
+++ include-samba-4.0.patch 2013-10-31 21:37:05 UTC (rev 198646)
@@ -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"
Modified: mplayer.desktop
===================================================================
--- mplayer.desktop 2013-10-31 18:54:26 UTC (rev 198645)
+++ mplayer.desktop 2013-10-31 21:37:05 UTC (rev 198646)
@@ -19,3 +19,4 @@
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
More information about the arch-commits
mailing list