summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/liferea-libre/PKGBUILD36
-rw-r--r--libre/liferea-libre/remove-non-free-suggestions.patch22
-rw-r--r--libre/mplayer-libre/.directory2
-rw-r--r--libre/mplayer-libre/PKGBUILD58
-rw-r--r--libre/mplayer-libre/live-media.patch13
-rw-r--r--libre/mplayer-libre/mplayer.desktop2
-rw-r--r--libre/mplayer-libre/mplayer.install4
7 files changed, 72 insertions, 65 deletions
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8ee55b4ba..b3ee94095 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 144935 2011-12-11 03:21:39Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: bitlord
+# Contributor (Parabola): bitlord
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
pkgbasename=liferea
pkgname=liferea-libre
-pkgver=1.6.6b
+pkgver=1.8.1b
pkgrel=1
pkgdesc="A desktop news aggregator for online news feeds and weblogs"
arch=('i686' 'x86_64')
@@ -13,35 +14,18 @@ provides=("liferea=$pkgver")
replaces=('liferea')
conflicts=('liferea')
license=('GPL')
-depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
-optdepends=('lua: for lua scripting support'
- 'libnotify: for notification support')
+depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme')
+makedepends=('intltool')
options=('!libtool' '!emptydirs')
install=liferea.install
-source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz
- libnotify-0.7.patch
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
remove-non-free-suggestions.patch)
-md5sums=('3e6a113a30f8d813c3a7ece4691d5afe'
- 'fca97e3316c1c51e0179c4c7dcce47a2'
- 'e138b67a6bc62d4ba0eb64b781105bf0')
-
-# source PKGBUILD ; mksource
-mksource() {
- wget http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz \
- -O - | tar xzf -
-
- pushd liferea-$pkgver >/dev/null
- patch -Np1 -i "../remove-non-free-suggestions.patch" || return 1
- popd >/dev/null
-
- tar cvzf $pkgname-$pkgver.tar.gz liferea-$pkgver/
- rm -rvf liferea-$pkgver/
-}
+md5sums=('70f27bfda41ff5b3b4e49c49c9dc88af'
+ 'e2fdcbc485ce6ff7956c8527be152ca6')
build() {
cd "${srcdir}/liferea-${pkgver}"
- patch -Np1 -i "$srcdir/libnotify-0.7.patch"
+ patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
make
}
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 8d1809122..325017567 100644
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
@@ -1,6 +1,6 @@
---- liferea-1.6.6b/src/ui/ui_prefs.c_orig 2011-06-23 01:33:39.761555322 +0200
-+++ liferea-1.6.6b/src/ui/ui_prefs.c 2011-06-23 01:38:02.121556890 +0200
-@@ -76,24 +76,10 @@
+--- liferea-1.8.0/src/browser.c_orig 2011-11-28 19:50:57.000000000 -0200
++++ liferea-1.8.0/src/browser.c 2012-03-07 14:49:31.862987204 -0200
+@@ -35,24 +35,16 @@
NULL, NULL
},
{
@@ -9,8 +9,12 @@
- NULL, "mozilla -remote openURL(%s)",
- NULL, "mozilla -remote 'openURL(%s,new-window)'",
- NULL, "mozilla -remote 'openURL(%s,new-tab)'"
-- },
-- {
++ "iceweasel", "Iceweasel", "iceweasel %s",
++ NULL, "iceweasel \"%s\"",
++ NULL, "iceweasel -new-window \"%s\"",
++ NULL, "iceweasel -new-tab \"%s\""
+ },
+ {
- /* tested with Firefox 1.5 and 2.0 */
- "firefox", "Firefox","firefox \"%s\"",
- NULL, "firefox -a firefox -remote \"openURL(%s)\"",
@@ -22,10 +26,10 @@
- "opera \"%s\"", "opera -remote \"openURL(%s)\"",
- "opera -newwindow \"%s\"", NULL,
- "opera -newpage \"%s\"", NULL
-+ "icecat", "IceCat","icecat \"%s\"",
-+ NULL, "icecat -a icecat -remote \"openURL(%s)\"",
-+ NULL, "icecat -a icecat -remote 'openURL(%s,new-window)'",
-+ NULL, "icecat -a icecat -remote 'openURL(%s,new-tab)'"
++ "icecat", "Icecat", "icecat %s",
++ NULL, "icecat \"%s\"",
++ NULL, "icecat -new-window \"%s\"",
++ NULL, "icecat -new-tab \"%s\""
},
{
"epiphany", "Epiphany","epiphany \"%s\"",
diff --git a/libre/mplayer-libre/.directory b/libre/mplayer-libre/.directory
new file mode 100644
index 000000000..724f09760
--- /dev/null
+++ b/libre/mplayer-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,7,11,33,38
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 3ca302e09..22142fa75 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,43 +1,49 @@
-# $Id: PKGBUILD 134009 2011-07-31 18:23:34Z ibiru $
+# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
# libvdpau is currently useful only with proprietary software
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34426
-pkgrel=3
+pkgver=34799
+pkgrel=2
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
license=('GPL')
url="http://www.mplayerhq.hu/"
options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('ff81117293e76b59e54debc439d8e612'
- 'c0d6ef795cf6de48e3b87ff7c23f0319')
+source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop
+ live-media.patch)
+md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53'
+ 'c0d6ef795cf6de48e3b87ff7c23f0319'
+ 'b6c057633ff7001ee0c102b5f81ec1e3')
build() {
- cd ${srcdir}/${_pkgbase}
+ cd "$srcdir/$_pkgbase"
+
+ patch -Np0 -i "$srcdir/live-media.patch"
./configure --prefix=/usr \
--enable-runtime-cpudetection \
--disable-gui \
--disable-arts \
--disable-liblzo \
- --enable-speex \
+ --disable-speex \
--disable-openal \
--disable-libdv \
--disable-musepack \
--disable-esd \
--disable-mga \
--disable-ass-internal \
- --disable-vdpau \
+ --disable-cdparanoia \
--enable-xvmc \
--enable-radio \
+ --enable-radio-capture \
--language=all \
--confdir=/etc/mplayer
[ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak
@@ -46,39 +52,37 @@ build() {
}
package_mplayer-libre() {
- pkgdesc="A movie player for linux (no unfree faac support)"
+ pkgdesc="A movie player for GNU/Linux (no unfree 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' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
- 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
+ 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+ 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
provides=("mplayer=$pkgver")
replaces=('mplayer')
conflicts=('mplayer')
- cd "${srcdir}/${_pkgbase}"
+ cd "$srcdir/$_pkgbase"
- make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
- 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"
- rm -rf "${pkgdir}/usr/share/mplayer/font"
+ make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+ 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"
+ 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/mplayer.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 unfree faac support)"
depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
- 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray')
+ 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
provides=("mencoder=$pkgver")
replaces=('mencoder')
conflicts=('mencoder')
- cd "${srcdir}/${_pkgbase}"
- make DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
+ cd "$srcdir/$_pkgbase"
+ make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
}
-md5sums=('ff81117293e76b59e54debc439d8e612'
- '647b9f4ab5284a7fef3f84f992214e77')
diff --git a/libre/mplayer-libre/live-media.patch b/libre/mplayer-libre/live-media.patch
new file mode 100644
index 000000000..b704b5381
--- /dev/null
+++ b/libre/mplayer-libre/live-media.patch
@@ -0,0 +1,13 @@
+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/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index e3229d042..07acea13f 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器
Comment[pl]=Odtwarzaj filmy i muzykę
Icon=mplayer
TryExec=mplayer
-Exec=mplayer -really-quiet %F
+Exec=mplayer %F
Terminal=false
NoDisplay=true
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install
index f98ba7338..660593cf5 100644
--- a/libre/mplayer-libre/mplayer.install
+++ b/libre/mplayer-libre/mplayer.install
@@ -3,9 +3,9 @@ post_install() {
}
post_upgrade() {
- post_install $1
+ post_install
}
post_remove() {
- post_install $1
+ post_install
}