From cd4c180e47e04758b683bde8ef28eebf5105fc49 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 9 Jul 2012 17:07:40 -0400 Subject: [PATCH] community/mplayer-vaapi to 35014-1 --- community/mplayer-vaapi/PKGBUILD | 34 ++++++++---------- community/mplayer-vaapi/live-media.patch | 13 ------- community/mplayer-vaapi/mplayer-vaapi.install | 8 +++-- community/mplayer-vaapi/mplayer.png | Bin 1982 -> 0 bytes .../mplayer-vaapi/tweak-desktop-file.patch | 22 +++--------- 5 files changed, 24 insertions(+), 53 deletions(-) delete mode 100644 community/mplayer-vaapi/live-media.patch delete mode 100644 community/mplayer-vaapi/mplayer.png diff --git a/community/mplayer-vaapi/PKGBUILD b/community/mplayer-vaapi/PKGBUILD index 549e6e564..758a04a88 100644 --- a/community/mplayer-vaapi/PKGBUILD +++ b/community/mplayer-vaapi/PKGBUILD @@ -1,16 +1,14 @@ -# $Id: PKGBUILD 70637 2012-05-13 16:56:17Z foutrelis $ +# $Id: PKGBUILD 73508 2012-07-08 19:34:25Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria -# ALARM: Kevin Mihelich # - remove --enable-runtime-cpudetection from configure -plugrel=1 - pkgname=mplayer-vaapi -pkgver=34578 -pkgrel=5 +pkgver=35014 +pkgrel=1 pkgdesc="A movie player, compiled with vaapi support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" @@ -19,30 +17,26 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl' 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' - 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2' - 'libva' 'libass' 'desktop-file-utils') + 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' + 'libbluray' 'libva' 'libass' 'desktop-file-utils') makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git') provides=("mplayer=$pkgver") conflicts=('mplayer') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz - tweak-desktop-file.patch - mplayer.png - live-media.patch) + tweak-desktop-file.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install -sha256sums=('cc35a057c8a64d2cdec2dc0a037811ef0f91dd03cd3d07465c7272a08665a37d' - '5b39f0a61969bf330c4434cb17975101be93c27334f65e154e4a93033033e795' - '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48' - '9c1400f27dd2ea54c125c66ed1af0eab19761b1b2ae808fa491cd3732fd8a685') +sha256sums=('db19a938e7de46aad567b6d7d8866ec6cb3919a29d60236609a83ebf4e1bb5f0' + '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') build() { cd "$srcdir/mplayer-vaapi-$pkgver" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" - patch -Np0 -i "$srcdir/live-media.patch" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --disable-gui \ --disable-arts \ --disable-liblzo \ @@ -55,6 +49,8 @@ build() { --disable-mga \ --disable-ass-internal \ --enable-xvmc \ + --enable-radio \ + --enable-radio-capture \ --disable-vdpau \ --enable-vaapi \ --language=all \ @@ -68,13 +64,13 @@ build() { package() { cd "$srcdir/mplayer-vaapi-$pkgver" - make -j1 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/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop" install -d "$pkgdir/usr/share/mplayer/" ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf" rm -rf "$pkgdir/usr/share/mplayer/font" - install -Dm644 "$srcdir/mplayer.png" "$pkgdir/usr/share/pixmaps/mplayer.png" + install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" } # vim:set ts=2 sw=2 et: diff --git a/community/mplayer-vaapi/live-media.patch b/community/mplayer-vaapi/live-media.patch deleted file mode 100644 index 73a6451f5..000000000 --- a/community/mplayer-vaapi/live-media.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libmpdemux/demux_rtp.cpp -=================================================================== ---- libmpdemux/demux_rtp.cpp (revision 34798) -+++ libmpdemux/demux_rtp.cpp (working copy) -@@ -19,6 +19,8 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 -+ - extern "C" { - // on MinGW, we must include windows.h before the things it conflicts - #ifdef __MINGW32__ // with. they are each protected from diff --git a/community/mplayer-vaapi/mplayer-vaapi.install b/community/mplayer-vaapi/mplayer-vaapi.install index af56cdbf4..a44f19aef 100644 --- a/community/mplayer-vaapi/mplayer-vaapi.install +++ b/community/mplayer-vaapi/mplayer-vaapi.install @@ -1,9 +1,11 @@ post_install() { - update-desktop-database -q + update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/community/mplayer-vaapi/mplayer.png b/community/mplayer-vaapi/mplayer.png deleted file mode 100644 index 7997693350bb2398bd53ecd3e7bb8ca320f212e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1982 zcmYM#cT`hZ9tZFwbcPx!5knbtfT6z7Cm_uL0U;tqLK6@INLM0Nn!C)9r6`l7NpD7E zX$Az5rl5c*Wf*0_Bs4KZKtKcx7}&i0v!C;R@B7X@=XcJ1@4j;{$pvRGE~+33fk4C^ zuozcvs(>XW$i1Ka{Gf{)g4ZtEV@`NP@CP*Rh)68fD~_93UfGRBSb&4^vDTs7RN>Vh zhvgOAR;B~S+C7Z1i4S!0@sK&5_ngmPuJ-F`1|D9CKtl7<%Zpy2dr-~4&nf>j<}N4w z_dkQjAJ=PM95ytt)+g55nK{*$RHOK9i=E*JCyYs;PpKWLpwq=ZYdStRe}AuY>w8^e z40WAG6bsqsB&Bv8RMK`UQu^Z<0?|uy$MU0-o=wVWC2QWZB)OCoR`o1%HHzVMuJ~eu zrfgfJ*Yd9gfK$k)cXKMR{-ZCVyiX+c>>?fVn7gJ5>z=!20WJQ+ zi&GAm;oZT5g_E!2>#Y>{&riKC=nX_t=Qc58*mH^nWBU4!sn7!KIk-;Eu8ip0x9!^7 zn_V1EUEOS3?B@K$#0-Vh%V4wdxzWjQCMwNLEH4GON7BA;P(7!Fvudd`%(I6Z2CXK@ zs~b`N>A5`haFwF5_|2Q9@bqlVVCn%O^kNGd6|E#A52EDf*w(&zvpSvyEzJ!qa@F?Z?i?F_K6i zZCz3M;3(4|w3lH8!9LW9T^^RS?4}Pkx{=uJcx}16d`fpmR(2pmJUPrZ->W`HpUUna z9*oi#R?>fbZx4z#*?z6{p{uKlZ*x;fB62}ugV7f>LaBl!bLKl0#M=Ugg6_)7^TqV; z%t!e74L@qJhMSJhVjE@Ul_Fm;R&Lgr!jJS2wKe zUN!J{(+4=l=f$=CE6L>jnv{^vU%D7;IBsJu0uvSve2;x@`-uj z=OO_(K^Q=Y3H}2bb{!-wj4FE@LOmV(j2_)}1}Jq>BReFv{s+YGt6Mz23RB>LZKk^ina>nK7L0ud1k$~{2KMQ=jCc^$+hvu(zCnDRtwKSCytwxhd zopdKhAx>)4r)^Sg_{!T~kB~wC^IbL?7cIttS3>e{f;uCH;|KhS4ZA2fG!17=OT^ITuud@ zzpT1^!iYA!k8gG%#vkwep>pR}0X<~?%fw2o?n$~4205||sdkUQU@!7CN^q>V!K!P6336SK1Mid`U@cwx;YL04L$g)B5n`Wlb{;Y$Q(UUIP{rvsH7! zlEZI`j2WQM@M#okUD1#ckq$--GR@-D5d7RX(-Ie~u3at-RZ3pFSyVfX{ir`g<;kHy zS+U!T^8V%K4(=YEgz=-TQ+s=R`%32>KOP)$xId&GLX2P6S7p9){iVF+ammAm)ry4V z6cP+tlsDpLq#__OBBX3uk+a#7!QD8POjVoSMKYchuWih+Si4LTJe9w|wb5O(5R=D) zS&B79N}RG)U5Yhy>>!LkaE|G-?FgMTSxD@|xU$|i>-7-@V8k98?JrkVO5DluS^MmX z%8L8w^hyl{!W>?kLtd$!&g!;u__tSWPmiLR1sj971dqM`7hF~bB=uVbcX=GXF;bkJ z>2#JNZaQOzqOLBfEJs4-rye;vW`mKOET>B$!4u-O$8RtvpxnuPKHysd#sy&++zrD( z%*BsGi<`7OncRn~!?04&+`IOwp75a#Ph~PW?W8@(D*DU6WY^#O^<6;9=VaM5=I7?I zZwpEMNb$P$G+$Xy>+CW+*saX!aa_lT&G=`E4;w*H#P5L!!T&y`_VqPyqA`!E16E(} zt&_g)z6&R_=C>A3w7wnonl}}$4M{Gf9&88JPJ=GjVuVWWqy5u4tHrwV(|rew8}=R^ zhaBDKHVFh7x$w?Q=WRQ#yLoweop$j)T&uISwK;8`Obl3@_0Mc+nY7$uL48}=+c`(Y z*Q^I{Q{kR1+B(1VaP~c#j3c{u)OY2gm()h8W;4AlwCdxuxo6)mL|Z&DIFLv{2i+ua z1ELS00386OgF?CM8=&=3Xnj*HKpzbN9p!1@3HtwrsF>jEAxYc@z*q+`