From aa9f33552ceab684146a63ca6392c73c8475c981 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Mar 2014 21:44:21 -0300 Subject: linux-libre-3.13.7-1: updating version --- libre/linux-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ef8344dce..0c533759a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $ +# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -_sublevel=6 +_sublevel=7 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver @@ -41,7 +41,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i8042-fix-aliases.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - 'bd937981937fd3c7a553fc770236e640' + '49c182728e5b977daefa5e8b0ca028e0' 'b6a3a3f9cac1be38384241ad58d45d46' '3740951ae165b89a2139d45ae7d82173' 'e49ac236dfeef709f91a3d993ea7b62c' -- cgit v1.2.3-54-g00ecf From dedccb7f1370cc1b68cc2d12b39be2b10ccf16b3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 01:42:57 -0300 Subject: hexchat-libre-2.9.6.1-2: python 3.4 rebuild --- libre/hexchat-libre/PKGBUILD | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'libre') diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index b1c9228a6..3c430015a 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97268 2013-09-15 22:44:23Z alucryd $ +# $Id: PKGBUILD 107420 2014-03-17 10:06:48Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: TingPing # Maintainer (Parabola): André Silva @@ -6,17 +6,16 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.6.1 -pkgrel=1 -pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)" +pkgrel=2 +pkgdesc='A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') -url="http://hexchat.github.io/" +url='http://hexchat.github.io/' license=('GPL') depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils') makedepends=('perl' 'python') optdepends=('enchant: Spell check' 'perl: Perl plugin' 'python: Python plugin') -options=('!libtool') install="${_pkgname}.install" replaces=$_pkgname conflicts=$_pkgname @@ -34,14 +33,14 @@ build() { sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n"\\\n "NAME Open Link in Private Icecat Window\\n" "CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c - ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe} + ./configure --prefix='/usr' --enable-{python='python3.4',shm,spell='libsexy',textfe} make } package() { cd ${_pkgname}-${pkgver} - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } # vim: ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 46d1e64ca0ccc422e75ab098a8e0e762a4f6c051 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 01:43:59 -0300 Subject: ice{cat,weasel}-noscript-2.6.8.19-1: updating version --- libre/icecat-noscript/PKGBUILD | 6 +++--- libre/iceweasel-noscript/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 732537aa8..67865faeb 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ +# $Id: PKGBUILD 108368 2014-03-27 09:25:40Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.17 +pkgver=2.6.8.19 pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('11a37854aeda9eae8de3a822633a369d') +md5sums=('9d1e6ff5f01b4758e84465f5d3ca976d') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 87a1964d3..f39297529 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ +# $Id: PKGBUILD 108368 2014-03-27 09:25:40Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.17 +pkgver=2.6.8.19 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('11a37854aeda9eae8de3a822633a369d') +md5sums=('9d1e6ff5f01b4758e84465f5d3ca976d') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` -- cgit v1.2.3-54-g00ecf From 4cb1469914aea1903491bdcbdae9f8836218d7ed Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 01:46:11 -0300 Subject: luxrender-libre-1.3.1-6: python 3.4 rebuild --- libre/luxrender-libre/PKGBUILD | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'libre') diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index c4e845d08..a6e0a2fc1 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 108358 2014-03-27 01:56:32Z svenstaro $ # Maintainer: Lukas Jirkovsky # Contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya @@ -7,16 +7,15 @@ _pkgname=luxrender pkgname=$_pkgname-libre pkgver=1.3.1 _pkgver=d0b0e20c47cc -pkgrel=3 -pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" +pkgrel=6 +pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree nvidia-utils, amdstream and intel-opencl-sdk recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.$_pkgname.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw') -optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ +depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl' 'fftw') +optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' \ - 'clang') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname @@ -34,14 +33,12 @@ prepare() { build() { cd "$srcdir"/$_pkgname-lux-$_pkgver - export CC=clang - export CXX=clang++ - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ + cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m + -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \ + . make } @@ -53,7 +50,7 @@ package() { [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.4/pylux.so } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 901e4ae9ffc1e18b053c2093b61fd1458993cb70 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 02:42:28 -0300 Subject: python-reportlab-libre-3.0-2: python 3.4 rebuild --- libre/python-reportlab-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD index 401d61c9f..c211f1567 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106308 2014-02-27 10:52:25Z jelle $ +# $Id: PKGBUILD 107615 2014-03-18 10:32:13Z jelle $ # Maintainer: # Contributor: Angel 'angvp' Velasquez # Contributor: William Rea @@ -10,12 +10,12 @@ pkgbase=python-reportlab-libre pkgname=(python2-reportlab-libre python-reportlab-libre) _origname=reportlab pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" arch=('i686' 'x86_64') url="http://www.reportlab.org/rl_toolkit.html" depends=('freetype2') -checkdepends=('python' 'python2') +checkdepends=('python' 'python2' 'python2-pillow' 'python-pillow') license=('custom') source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz free-fonts.patch) -- cgit v1.2.3-54-g00ecf From 287c8294aff074d5b7323d0ef3d7ade7297319dc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 02:43:43 -0300 Subject: reflector-2014-4: python 3.4 rebuild --- libre/reflector/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD index c8bc6bd5e..002607a7e 100644 --- a/libre/reflector/PKGBUILD +++ b/libre/reflector/PKGBUILD @@ -2,7 +2,7 @@ #Maintainer (Parabola): André Silva pkgname=reflector pkgver=2014 -pkgrel=2.1 +pkgrel=4 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)' arch=(any) license=(GPL) -- cgit v1.2.3-54-g00ecf From f2987e3f9d960c8828c37df2d7733d7d4f0d49c0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 20:56:53 -0300 Subject: avidemux-libre-2.5.6-9: rebuild against x264 20140311 --- libre/avidemux-libre/PKGBUILD | 8 ++++---- libre/avidemux-libre/PKGBUILD.WIP | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD index 81585ce70..797135fd3 100644 --- a/libre/avidemux-libre/PKGBUILD +++ b/libre/avidemux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198769 2013-11-03 19:15:23Z eric $ +# $Id: PKGBUILD 208659 2014-03-24 20:18:17Z eric $ # Maintainer: Eric Bélanger # Maintainer (Parabola): André Silva @@ -6,12 +6,12 @@ _pkgbase=avidemux pkgbase=avidemux-libre pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') pkgver=2.5.6 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \ +makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP index 5496ecffb..e08bbc795 100644 --- a/libre/avidemux-libre/PKGBUILD.WIP +++ b/libre/avidemux-libre/PKGBUILD.WIP @@ -5,7 +5,7 @@ _pkgbase=avidemux pkgbase=avidemux-libre pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') -pkgver=2.6.6 +pkgver=2.6.8 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -16,7 +16,7 @@ makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ 'libvdpau' 'libdca' 'fribidi' 'glu') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743') +sha1sums=('50f3dfe270e6272fce46d725b198b9d0dd95664b') #source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) #sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') -- cgit v1.2.3-54-g00ecf From f18f0b4b923c9a2cdc4602a3d6215a2cb023723b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 20:59:38 -0300 Subject: calibre-libre-1.30.0-1: updating version --- libre/calibre-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index fc37c552e..91acacaf0 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108021 2014-03-21 08:59:30Z jelle $ +# $Id: PKGBUILD 108545 2014-03-28 10:05:28Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -9,9 +9,9 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.29.0 +pkgver=1.30.0 pkgrel=1 -pkgdesc="Ebook management application, with unar support" +pkgdesc="Ebook management application, without libunrar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') @@ -19,7 +19,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 'python2-pillow' 'shared-mime-info' 'python2-dnspython' - 'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' + 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect' 'python2-apsw') makedepends=('python2-pycountry' 'qt4-private-headers') optdepends=('ipython2: to use calibre-debug') @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('1df9ee27a9bff5072184d5e9629f1209' +md5sums=('2dadae4d9293ee33e99afae2e223686e' 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7') -- cgit v1.2.3-54-g00ecf From 45347ba51ace8d464839a8815a1b1a723a762c51 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 21:01:22 -0300 Subject: cups-filters-libre-1.0.50-1: updating version --- libre/cups-filters-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 60ec4cd57..2d5b0887b 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 208587 2014-03-24 15:30:08Z andyrtr $ +# $Id: PKGBUILD 208919 2014-03-28 18:09:56Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.49 +pkgver=1.0.50 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar. provides=("${_pkgname}=${pkgver}" 'foomatic-filters') replaces=("${_pkgname}" 'foomatic-filters') conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('7edf215f1e56d1a2470af5940e1ffe61') +md5sums=('b5f15a12bf2f55382be29bb2c99d1b9f') build() { cd $_pkgname-$pkgver -- cgit v1.2.3-54-g00ecf From 612b49a3e670481c5e21df198cda5e6ca9dd1164 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 21:02:47 -0300 Subject: libquicktime-libre-1.2.4-9: rebuild against ffmpeg 2.2 --- libre/libquicktime-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 4da010a38..5f44d0c5d 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100489 2013-11-05 09:06:26Z bpiotrowski $ +# $Id: PKGBUILD 108180 2014-03-24 09:50:56Z bpiotrowski $ # Maintainer: Federico Cinelli # Maintainer: Mateusz Herych # Contributor (Parabola): Jorge Lopez @@ -6,7 +6,7 @@ pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=8 +pkgrel=9 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64') license=('GPL') -- cgit v1.2.3-54-g00ecf From 17a49b9d2e08b62e536cf536288821a86afe07d5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 21:25:29 -0300 Subject: mplayer-libre-37051-2: updating version * rebuild against ffmpeg 2.2 --- libre/mplayer-libre/PKGBUILD | 163 ++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 78 deletions(-) (limited to 'libre') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 35054754d..8600ea77f 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 204039 2014-01-14 12:09:50Z jgc $ -# Maintainer : Ionut Biru +# $Id: PKGBUILD 208941 2014-03-28 21:27:08Z bpiotrowski $ +# Maintainer: Ionut Biru +# Maintainer: Bartłomiej Piotrowski # Contributor: Hugo Doria # Maintainer (Parabola): André Silva # Contributor (Parabola): Márcio Silva @@ -7,109 +8,115 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=36498 -pkgrel=5 +pkgver=37051 +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' 'opus' - ) + '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/' options=('!buildflags' '!emptydirs') -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz - http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2 +source=($_pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver + http://ffmpeg.org/releases/ffmpeg-2.2.tar.bz2 mplayer.desktop cdio-includes.patch include-samba-4.0.patch) -md5sums=('8b856e8833d910b6e38b04bb8453d0dc' - '4ec1cedd4c7753512462f70b347c338a' +md5sums=('SKIP' + '744febca199548c9393b1f1ed05ccdd8' '62f44a58f072b2b1a3c3d3e4976d64b3' '7b5be7191aafbea64218dc4916343bbc' '868a92bdef148df7f38bfa992b26ce9d') +pkgver() { + cd $_pkgbase-$pkgver + svnversion +} + prepare() { - cd $_pkgbase-$pkgver - patch -p0 -i ../cdio-includes.patch - patch -p1 -i ../include-samba-4.0.patch + cd $_pkgbase-$pkgver + mv ../ffmpeg-2.2 ./ffmpeg + + patch -p0 -i ../cdio-includes.patch + patch -p1 -i ../include-samba-4.0.patch - mv ../ffmpeg-2.1 ./ffmpeg + ./version.sh } build() { - cd $_pkgbase-$pkgver + cd $_pkgbase-$pkgver - ./configure --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --disable-ass-internal \ - --disable-cdparanoia \ - --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 + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --disable-ass-internal \ + --disable-cdparanoia \ + --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 - make + make } 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-font' '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') + pkgdesc='Media 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-font' '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 $_pkgbase-$pkgver - make DESTDIR="$pkgdir" install-mplayer install-mplayer-man + 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/" - # 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" + # desktop file (FS#14770) + install -Dm644 ../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' 'opus' - ) - provides=("mencoder=$pkgver") - replaces=('mencoder') - conflicts=('mencoder') + 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' 'opus' + ) + provides=("mencoder=$pkgver") + replaces=('mencoder') + conflicts=('mencoder') - 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 {} + + make -C $_pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man + find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } -- cgit v1.2.3-54-g00ecf From 5be6ed546c79eb2c412d02b5b78831de1a9cfbd8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 21:37:03 -0300 Subject: rename mplayer-vaapi-libre to mplayer-libre-vaapi and rebuild against libx264.so.142 --- libre/mplayer-libre-vaapi/PKGBUILD | 95 ++++++++++++++++++++++ libre/mplayer-libre-vaapi/cdio-includes.patch | 43 ++++++++++ libre/mplayer-libre-vaapi/mplayer-vaapi.install | 11 +++ .../subreader-fix-srt-parsing.patch | 40 +++++++++ libre/mplayer-libre-vaapi/tweak-desktop-file.patch | 14 ++++ libre/mplayer-vaapi-libre/PKGBUILD | 95 ---------------------- libre/mplayer-vaapi-libre/cdio-includes.patch | 43 ---------- libre/mplayer-vaapi-libre/mplayer-vaapi.install | 11 --- .../subreader-fix-srt-parsing.patch | 40 --------- libre/mplayer-vaapi-libre/tweak-desktop-file.patch | 14 ---- 10 files changed, 203 insertions(+), 203 deletions(-) create mode 100644 libre/mplayer-libre-vaapi/PKGBUILD create mode 100644 libre/mplayer-libre-vaapi/cdio-includes.patch create mode 100644 libre/mplayer-libre-vaapi/mplayer-vaapi.install create mode 100644 libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch create mode 100644 libre/mplayer-libre-vaapi/tweak-desktop-file.patch delete mode 100644 libre/mplayer-vaapi-libre/PKGBUILD delete mode 100644 libre/mplayer-vaapi-libre/cdio-includes.patch delete mode 100644 libre/mplayer-vaapi-libre/mplayer-vaapi.install delete mode 100644 libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch delete mode 100644 libre/mplayer-vaapi-libre/tweak-desktop-file.patch (limited to 'libre') diff --git a/libre/mplayer-libre-vaapi/PKGBUILD b/libre/mplayer-libre-vaapi/PKGBUILD new file mode 100644 index 000000000..68873d749 --- /dev/null +++ b/libre/mplayer-libre-vaapi/PKGBUILD @@ -0,0 +1,95 @@ +# $Id: PKGBUILD 108189 2014-03-24 13:39:00Z foutrelis $ +# Maintainer: Evangelos Foutras +# Contributor: Ionut Biru +# Contributor: Hugo Doria +# Maintainer (Parabola): André Silva +# Contributor (Parabola): Nicolás Reynolds +# Contributor (Parabola): Márcio Silva + +_pkgname=mplayer-vaapi +pkgname=mplayer-libre-vaapi +pkgver=36265 +pkgrel=9 +pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" +arch=('i686' 'x86_64') +url="http://gitorious.org/vaapi/mplayer" +license=('GPL') +depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' + 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' + 'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' + 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' + 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' + 'libbluray' 'libva' 'libass' 'desktop-file-utils') +makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') +provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver" 'mplayer-vaapi-libre') +conflicts=('mplayer' 'mplayer-vaapi' 'mplayer-vaapi-libre') +replaces=('mplayer-vaapi' 'mplayer-vaapi-libre') +backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') +source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig} + cdio-includes.patch + tweak-desktop-file.patch + subreader-fix-srt-parsing.patch) +options=('!buildflags' '!emptydirs') +install=mplayer-vaapi.install +sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a' + 'SKIP' + '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' + '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' + '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') + + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + + patch -Np0 -i "$srcdir/cdio-includes.patch" + patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" + + # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 + patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-gif \ + --disable-liblzo \ + --enable-speex \ + --disable-cdparanoia \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --disable-ass-internal \ + --disable-faac \ + --enable-xvmc \ + --enable-radio \ + --enable-radio-capture \ + --disable-vdpau \ + --enable-vaapi \ + --language=all \ + --confdir=/etc/mplayer + + [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak + + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + 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 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/mplayer-libre-vaapi/cdio-includes.patch b/libre/mplayer-libre-vaapi/cdio-includes.patch new file mode 100644 index 000000000..894650717 --- /dev/null +++ b/libre/mplayer-libre-vaapi/cdio-includes.patch @@ -0,0 +1,43 @@ +Index: configure +=================================================================== +--- configure (revision 35421) ++++ configure (working copy) +@@ -5968,8 +5968,8 @@ + cat > $TMPC << EOF + #include + #include +-#include +-#include ++#include ++#include + 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 ++#include + #elif defined(CONFIG_CDDA) + #include + #endif +Index: stream/stream_cdda.c +=================================================================== +--- stream/stream_cdda.c (revision 35421) ++++ stream/stream_cdda.c (working copy) +@@ -21,8 +21,8 @@ + #include + #include + #else +-#include +-#include ++#include ++#include + #endif + #include + #include diff --git a/libre/mplayer-libre-vaapi/mplayer-vaapi.install b/libre/mplayer-libre-vaapi/mplayer-vaapi.install new file mode 100644 index 000000000..a44f19aef --- /dev/null +++ b/libre/mplayer-libre-vaapi/mplayer-vaapi.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} +post_upgrade() { + post_install +} +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch b/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch new file mode 100644 index 000000000..f1c087377 --- /dev/null +++ b/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch @@ -0,0 +1,40 @@ +Index: sub/subreader.c +=================================================================== +--- sub/subreader.c (revision 36284) ++++ sub/subreader.c (revision 36285) +@@ -378,14 +378,14 @@ + int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; + + while (!current->text[0]) { +- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; ++ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; + int i; + + /* Parse SubRip header */ + if (!stream_read_line(st, line, LINE_LEN, utf16)) + return NULL; +- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", +- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) ++ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", ++ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) + continue; + + current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; +@@ -442,7 +442,7 @@ + #endif + while (!current->text[0]) { + if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; +- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) ++ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; +@@ -1123,7 +1123,7 @@ + {*uses_time=1;return SUB_MPL2;} + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBRIP;} +- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) ++ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBVIEWER;} + if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) + {*uses_time=1;return SUB_SUBVIEWER2;} diff --git a/libre/mplayer-libre-vaapi/tweak-desktop-file.patch b/libre/mplayer-libre-vaapi/tweak-desktop-file.patch new file mode 100644 index 000000000..606e356b0 --- /dev/null +++ b/libre/mplayer-libre-vaapi/tweak-desktop-file.patch @@ -0,0 +1,14 @@ +--- mplayer.desktop.orig 2012-07-08 22:18:27.000000000 +0300 ++++ mplayer.desktop 2012-07-08 22:19:08.000000000 +0300 +@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques + Comment[it]=Riproduce filmati e musica + Comment[ja]=動画や音声のファイルを再生します + Icon=mplayer +-TryExec=gmplayer +-Exec=gmplayer %F ++TryExec=mplayer ++Exec=mplayer -really-quiet %F + Terminal=false ++NoDisplay=true + Categories=GTK;AudioVideo;Audio;Video;Player;TV; + MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm; diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD deleted file mode 100644 index 7b7870e69..000000000 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ /dev/null @@ -1,95 +0,0 @@ -# $Id: PKGBUILD 104019 2014-01-14 16:12:02Z bpiotrowski $ -# Maintainer: Evangelos Foutras -# Contributor: Ionut Biru -# Contributor: Hugo Doria -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Nicolás Reynolds -# Contributor (Parabola): Márcio Silva - -_pkgname=mplayer-vaapi -pkgname=mplayer-vaapi-libre -pkgver=36265 -pkgrel=8 -pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" -arch=('i686' 'x86_64') -url="http://gitorious.org/vaapi/mplayer" -license=('GPL') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' - 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' - 'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' - 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' - 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' - 'libbluray' 'libva' 'libass' 'desktop-file-utils') -makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') -provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver") -conflicts=('mplayer' 'mplayer-vaapi') -replaces=('mplayer-vaapi') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig} - cdio-includes.patch - tweak-desktop-file.patch - subreader-fix-srt-parsing.patch) -options=('!buildflags' '!emptydirs') -install=mplayer-vaapi.install -sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a' - 'SKIP' - '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' - '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' - '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') - - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - - patch -Np0 -i "$srcdir/cdio-includes.patch" - patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" - - # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 - patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" -} - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-gif \ - --disable-liblzo \ - --enable-speex \ - --disable-cdparanoia \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --disable-ass-internal \ - --disable-faac \ - --enable-xvmc \ - --enable-radio \ - --enable-radio-capture \ - --disable-vdpau \ - --enable-vaapi \ - --language=all \ - --confdir=/etc/mplayer - - [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak - - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - 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 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/mplayer-vaapi-libre/cdio-includes.patch b/libre/mplayer-vaapi-libre/cdio-includes.patch deleted file mode 100644 index 894650717..000000000 --- a/libre/mplayer-vaapi-libre/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 - #include --#include --#include -+#include -+#include - 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 -+#include - #elif defined(CONFIG_CDDA) - #include - #endif -Index: stream/stream_cdda.c -=================================================================== ---- stream/stream_cdda.c (revision 35421) -+++ stream/stream_cdda.c (working copy) -@@ -21,8 +21,8 @@ - #include - #include - #else --#include --#include -+#include -+#include - #endif - #include - #include diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-vaapi-libre/mplayer-vaapi.install deleted file mode 100644 index a44f19aef..000000000 --- a/libre/mplayer-vaapi-libre/mplayer-vaapi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} -post_upgrade() { - post_install -} -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch deleted file mode 100644 index f1c087377..000000000 --- a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: sub/subreader.c -=================================================================== ---- sub/subreader.c (revision 36284) -+++ sub/subreader.c (revision 36285) -@@ -378,14 +378,14 @@ - int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; - - while (!current->text[0]) { -- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; -+ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; - int i; - - /* Parse SubRip header */ - if (!stream_read_line(st, line, LINE_LEN, utf16)) - return NULL; -- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", -- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", -+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) - continue; - - current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; -@@ -442,7 +442,7 @@ - #endif - while (!current->text[0]) { - if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; -- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) - continue; - current->start = a1*360000+a2*6000+a3*100+a4/10; - current->end = b1*360000+b2*6000+b3*100+b4/10; -@@ -1123,7 +1123,7 @@ - {*uses_time=1;return SUB_MPL2;} - if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) - {*uses_time=1;return SUB_SUBRIP;} -- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) -+ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) - {*uses_time=1;return SUB_SUBVIEWER;} - if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) - {*uses_time=1;return SUB_SUBVIEWER2;} diff --git a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch deleted file mode 100644 index 606e356b0..000000000 --- a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mplayer.desktop.orig 2012-07-08 22:18:27.000000000 +0300 -+++ mplayer.desktop 2012-07-08 22:19:08.000000000 +0300 -@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques - Comment[it]=Riproduce filmati e musica - Comment[ja]=動画や音声のファイルを再生します - Icon=mplayer --TryExec=gmplayer --Exec=gmplayer %F -+TryExec=mplayer -+Exec=mplayer -really-quiet %F - Terminal=false -+NoDisplay=true - Categories=GTK;AudioVideo;Audio;Video;Player;TV; - MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm; -- cgit v1.2.3-54-g00ecf From 6551c1a67920b0897d6a9f083ccbf4b606435ebf Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 21:59:21 -0300 Subject: ogre-libre-1.9.0-5: rebuild against ffmpeg 2.2 --- libre/ogre-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index c7760d9da..f5635aa15 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -14,7 +14,7 @@ pkgname=( #$_bldname-addon-$pkgbase # package unstable ) pkgver=1.9.0 -pkgrel=4 +pkgrel=5 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' arch=( mips64el -- cgit v1.2.3-54-g00ecf From f77f6390ff2057bc8bbf9a543a257d03e07b24b7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Mar 2014 23:25:00 -0300 Subject: ca-certificates: add previous version package on [libre] until solve server problem => https://lists.parabolagnulinux.org/pipermail/dev/2014-March/002129.html --- libre/ca-certificates/PKGBUILD | 43 +++++++++++++++++++++++++++ libre/ca-certificates/ca-certificates.install | 26 ++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 libre/ca-certificates/PKGBUILD create mode 100644 libre/ca-certificates/ca-certificates.install (limited to 'libre') diff --git a/libre/ca-certificates/PKGBUILD b/libre/ca-certificates/PKGBUILD new file mode 100644 index 000000000..94fc54223 --- /dev/null +++ b/libre/ca-certificates/PKGBUILD @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Pierre Schmitz + +pkgname=ca-certificates +pkgver=20130906 +pkgrel=1 +pkgdesc='Common CA certificates' +arch=('any') +url='http://packages.qa.debian.org/c/ca-certificates.html' +license=('MPL' 'GPL') +source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz") +depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed') +makedepends=('python2') +install='ca-certificates.install' +backup=('etc/ca-certificates.conf') +sha256sums=('dd10520091d469e95e11e5fafb7422d3be0a66071984d09009ed3e0232cb277d') + +prepare() { + cd ${srcdir}/${pkgname} + sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py + sed 's|python|python2|g' -i mozilla/Makefile +} + +build() { + cd ${srcdir}/${pkgname} + make +} + +package() { + cd ${srcdir}/${pkgname} + install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs} + make install DESTDIR=${pkgdir} + mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin + install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8 + + ( + echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" + echo "# see update-ca-certificates man page" + echo "# " + cd ${pkgdir}/usr/share/ca-certificates + find . -name '*.crt' | sort | cut -b3- + ) > ${pkgdir}/etc/ca-certificates.conf +} diff --git a/libre/ca-certificates/ca-certificates.install b/libre/ca-certificates/ca-certificates.install new file mode 100644 index 000000000..4e90c2ef6 --- /dev/null +++ b/libre/ca-certificates/ca-certificates.install @@ -0,0 +1,26 @@ +export LC_ALL=C + +post_install() { + usr/bin/update-ca-certificates --fresh >/dev/null 2>&1 +} + +post_upgrade() { + if [ $(vercmp $2 20110421-1) -lt 0 ]; then + echo 'Updating certificates. This might take a while...' + fi + usr/bin/update-ca-certificates --fresh >/dev/null 2>&1 +} + +pre_remove() { + # clean up certificates + local _backup=$(mktemp) + mv etc/ca-certificates.conf ${_backup} + echo > etc/ca-certificates.conf + usr/bin/update-ca-certificates --fresh >/dev/null 2>&1 + mv ${_backup} etc/ca-certificates.conf +} + +post_remove() { + # remove the cert file if it is empty + [[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f etc/ssl/certs/ca-certificates.crt +} -- cgit v1.2.3-54-g00ecf From 13a3692870bcd5efe19ca3ccc50a36f7dd188e52 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 00:28:02 -0300 Subject: ca-certificates-20130906-1.1: updating release --- libre/ca-certificates/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/ca-certificates/PKGBUILD b/libre/ca-certificates/PKGBUILD index 94fc54223..8704cf896 100644 --- a/libre/ca-certificates/PKGBUILD +++ b/libre/ca-certificates/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ca-certificates pkgver=20130906 -pkgrel=1 +pkgrel=1.1 pkgdesc='Common CA certificates' arch=('any') url='http://packages.qa.debian.org/c/ca-certificates.html' -- cgit v1.2.3-54-g00ecf From 12a746d61f6bbb363e79e64d3a3526af04e545f2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 01:41:29 -0300 Subject: calibre-libre: fix description on pkgdesc --- libre/calibre-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 91acacaf0..817019c8c 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -11,7 +11,7 @@ _pkgname=calibre pkgname=calibre-libre pkgver=1.30.0 pkgrel=1 -pkgdesc="Ebook management application, without libunrar support" +pkgdesc="Ebook management application, without nonfree libunrar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') -- cgit v1.2.3-54-g00ecf From d129573125a9b0f41aeb6c8cc4d5b8698407413b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 01:43:06 -0300 Subject: doublecmd-libre: fix description on pkgdesc --- libre/doublecmd-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index 10f8bc81f..1e14d5588 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=doublecmd-libre pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') pkgver=0.5.9 _helpver=0.5.5 -pkgrel=1 +pkgrel=1.1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') @@ -48,7 +48,7 @@ build() { } package_doublecmd-libre-gtk2() { - pkgdesc="twin-panel (commander-style) file manager (GTK), without libunrar recommendation" + pkgdesc="twin-panel (commander-style) file manager (GTK), without nonfree libunrar recommendation" depends=('gtk2') conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre') replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') @@ -62,7 +62,7 @@ package_doublecmd-libre-gtk2() { } package_doublecmd-libre-qt() { - pkgdesc="twin-panel (commander-style) file manager (QT), without libunrar recommendation" + pkgdesc="twin-panel (commander-style) file manager (QT), without nonfree libunrar recommendation" depends=('qt4pas') conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') replaces=('doublecmd-qt' 'doublecmd-qt-libre') -- cgit v1.2.3-54-g00ecf From c2e12e2d5d876a17c0d9d2778548d16ec5180a79 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 01:43:33 -0300 Subject: p7zip-libre: fix description on pkgdesc --- libre/p7zip-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index 12b1d4bc1..f53c3a28d 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -8,8 +8,8 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=9 -pkgdesc='Command-line version of the 7zip compressed file archiver, without unrar support' +pkgrel=9.1 +pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree unrar support' url='http://p7zip.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3-54-g00ecf From c32a9e5d18b65b25dfb81bbbb27870521c35af32 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 02:01:00 -0300 Subject: dvdrip-libre: fix description on pkgdesc --- libre/dvdrip-libre/PKGBUILD | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD index 71a938c66..06dee1752 100644 --- a/libre/dvdrip-libre/PKGBUILD +++ b/libre/dvdrip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 102182 2013-12-06 12:17:23Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Fredrik Hammar # Maintainer (Parabola): Márcio Silva @@ -6,8 +6,8 @@ _pkgname=dvdrip pkgname=dvdrip-libre pkgver=0.98.11 -pkgrel=10.2 -pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies" +pkgrel=10.3 +pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and nonfree rar vobsub compression support" arch=('i686' 'x86_64') license=('custom') url="http://www.exit1.org/${_pkgname}/" @@ -32,10 +32,14 @@ md5sums=('6dfa4199d451757a37eea233a07da4c0' 'e91cf411928fd0500d07a0022b4ef546' 'bc006d3b3447f8b62ae6ba29773a064b') -build() { +prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -Np1 -i "$srcdir/libre.patch" +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -- cgit v1.2.3-54-g00ecf From 456bd35a77c8554edca09962e7a35445cf65ec1c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 02:30:30 -0300 Subject: bitlbee-libre{,-nonprism}: fix description on pkgdesc --- libre/bitlbee-libre/PKGBUILD | 4 ++-- nonprism/bitlbee-libre-nonprism/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD index 66883426b..f2b720404 100644 --- a/libre/bitlbee-libre/PKGBUILD +++ b/libre/bitlbee-libre/PKGBUILD @@ -11,8 +11,8 @@ _pkgname=bitlbee pkgname=bitlbee-libre pkgver=3.2.1 -pkgrel=2 -pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without Skype support' +pkgrel=2.1 +pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support' url='http://www.bitlbee.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD index 8ed31d8b9..9d29dce35 100644 --- a/nonprism/bitlbee-libre-nonprism/PKGBUILD +++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD @@ -11,8 +11,8 @@ _pkgname=bitlbee pkgname=bitlbee-libre-nonprism pkgver=3.2.1 -pkgrel=2 -pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols' +pkgrel=2.1 +pkgdesc='Brings XMPP to IRC, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://www.bitlbee.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3-54-g00ecf From 67dec1895b1f4218ee69c607aab8bb9589ee5264 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 02:31:33 -0300 Subject: kdenetwork-kopete-libre{,-nonprism}: fix description on pkgdesc --- libre/kdenetwork-kopete-libre/PKGBUILD | 4 ++-- nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index a33841bb2..ec7b621f5 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre pkgver=4.12.3 -pkgrel=1 -pkgdesc='Instant Messenger, without Skype support' +pkgrel=1.1 +pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index c5ad0543c..b60446276 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre-nonprism pkgver=4.12.3 -pkgrel=1 -pkgdesc='Instant Messenger, without Skype and support for unsafe and dangerous for privacy protocols' +pkgrel=1.1 +pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') -- cgit v1.2.3-54-g00ecf From 4c5b4a34c333202dbea59b9cb91c4f4fff68a7ed Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 05:30:09 -0300 Subject: ogre-libre: fix URL source --- libre/ogre-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index f5635aa15..7e4692ab3 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -48,7 +48,7 @@ mksource=( libre.patch ) source=( - https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-libre-$pkgver.tar.xz + https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz ) mksha512sums=( SKIP -- cgit v1.2.3-54-g00ecf From 349043c2f695b6c49d678776255f06cde756ff28 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 06:45:06 -0300 Subject: bitlbee-libre-3.2.1-2.2: updating revision --- libre/bitlbee-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD index f2b720404..575fc6979 100644 --- a/libre/bitlbee-libre/PKGBUILD +++ b/libre/bitlbee-libre/PKGBUILD @@ -11,7 +11,7 @@ _pkgname=bitlbee pkgname=bitlbee-libre pkgver=3.2.1 -pkgrel=2.1 +pkgrel=2.2 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support' url='http://www.bitlbee.org/' license=('GPL') -- cgit v1.2.3-54-g00ecf From 05cbaa31628d7efb49ed05ebdf34fa357460fc95 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 29 Mar 2014 15:56:17 -0300 Subject: ogre-libre: move mesa header symlinks to prepare function --- libre/ogre-libre/PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index 7e4692ab3..f91855322 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -70,7 +70,7 @@ mksource() { patch -Np1 -i $srcdir/libre.patch } -build() { +prepare() { cd ${pkgbase} # add symlinks to point to mesa header files @@ -80,6 +80,10 @@ build() { ln -sv /usr/include/GL/wglext.h wglext.h ln -sv /usr/include/GL/glxtokens.h glxtokens.h ln -sv /usr/include/GL/glxext.h glxext.h +} + +build() { + cd ${pkgbase} # get a clean build dir [[ -d build ]] && rm -vrf build @@ -122,7 +126,8 @@ build() { -D${pkgbase^^}_LIB_DIRECTORY=lib\ -D${pkgbase^^}_PROFILING=TRUE\ -D${pkgbase^^}_USE_BOOST=TRUE - make V=0 +# make V=0 + make } package_ogre-libre() { -- cgit v1.2.3-54-g00ecf From 82f889129eaaef97286835261e5d81dfba0fa193 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 30 Mar 2014 18:38:20 -0300 Subject: vim-runtime-7.4.214-1: updating version --- libre/vim-runtime/PKGBUILD | 8 +- libre/vim/PKGBUILD | 227 --------------------------------------------- libre/vim/gvim.desktop | 63 ------------- libre/vim/gvim.install | 11 --- libre/vim/parabola.vim | 27 ------ libre/vim/vimrc | 16 ---- 6 files changed, 4 insertions(+), 348 deletions(-) delete mode 100644 libre/vim/PKGBUILD delete mode 100644 libre/vim/gvim.desktop delete mode 100644 libre/vim/gvim.install delete mode 100644 libre/vim/parabola.vim delete mode 100644 libre/vim/vimrc (limited to 'libre') diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD index 189d67c6b..797c5c838 100644 --- a/libre/vim-runtime/PKGBUILD +++ b/libre/vim-runtime/PKGBUILD @@ -8,11 +8,11 @@ pkgbase=vim pkgname=vim-runtime _topver=7.4 -_patchlevel=135 -__hgrev=de28b1568fc2 +_patchlevel=214 +__hgrev=d2ef98a43b5d _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" @@ -21,7 +21,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" 'vimrc' 'parabola.vim') -md5sums=('be672ce2a929503412378c998fc3dc27' +md5sums=('5ec7d7f84955dacfef88e52ebc79b267' 'SKIP' '27820c2bdc34624674c561ae6476bc6a' 'a8c21928eefd766e211f987879a9199c') diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD deleted file mode 100644 index ed2252afd..000000000 --- a/libre/vim/PKGBUILD +++ /dev/null @@ -1,227 +0,0 @@ -# Maintainer: Thomas Dziedzic -# Contributor: Jan "heftig" Steffens -# Contributor: tobias [ tobias at archlinux org ] -# Contributor: Daniel J Griffiths - -pkgbase=vim -pkgname=('vim' 'gvim' 'vim-runtime') -_topver=7.4 -_patchlevel=135 -__hgrev=de28b1568fc2 -_versiondir="vim${_topver//./}" -pkgver=${_topver}.${_patchlevel} -pkgrel=2.1 -arch=('i686' 'x86_64') -license=('custom:vim') -url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') -source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'vimrc' - 'parabola.vim' - 'gvim.desktop') -md5sums=('be672ce2a929503412378c998fc3dc27' - 'SKIP' - '27820c2bdc34624674c561ae6476bc6a' - 'a8c21928eefd766e211f987879a9199c' - 'd90413bd21f400313a785bb4010120cd') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) - - __hgroot='http://vim.googlecode.com/hg/' - __hgrepo='vim' - __hgbranch='default' - - hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} - - pushd ${__hgrepo} - if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then - printf 'You are not building the latest revision!\n' - printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" - fi - popd - - mv vim ${pkgname}-${pkgver} - find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; - rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} - tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* - rm -r ${pkgname}-${pkgver} - - gpg --detach-sign ${pkgname}-${pkgver}.tar.xz - - scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ - scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ -} - -build() { - cp -a ${pkgname}-${pkgver} vim-build - - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - - (cd vim-build/src && autoconf) - - cp -a vim-build gvim-build - - cd "${srcdir}"/vim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Parabola GNU/Linux-libre' \ - --enable-gpm \ - --enable-acl \ - --with-x=no \ - --disable-gui \ - --enable-multibyte \ - --enable-cscope \ - --disable-netbeans \ - --enable-perlinterp \ - --disable-pythoninterp \ - --disable-python3interp \ - --disable-rubyinterp \ - --disable-luainterp - - make - - cd "${srcdir}"/gvim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Parabola GNU/Linux-libre' \ - --enable-gpm \ - --enable-acl \ - --with-x=yes \ - --enable-gui=gtk2 \ - --enable-multibyte \ - --enable-cscope \ - --enable-netbeans \ - --enable-perlinterp \ - --enable-pythoninterp \ - --disable-python3interp \ - --enable-rubyinterp \ - --enable-luainterp - - make -} - -check() { - # disable tests because they seem to freeze - - cd "${srcdir}"/vim-build - - #make test - - cd "${srcdir}"/gvim-build - - #make test -} - -package_vim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') - conflicts=('gvim') - - cd "${srcdir}"/vim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - rm -f evim.1 # this does not make sense if we have no GUI - done - - # Runtime provided by runtime package - rm -r "${pkgdir}"/usr/share/vim - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_gvim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' - 'desktop-file-utils' 'gtk2' 'lua' 'python2') - provides=("vim=${pkgver}-${pkgrel}") - conflicts=('vim') - install=gvim.install - - cd "${srcdir}"/gvim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - done - - # Move the runtime for later packaging - mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install - - # freedesktop links - install -Dm644 "${srcdir}"/gvim.desktop \ - "${pkgdir}"/usr/share/applications/gvim.desktop - install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_vim-runtime() { - pkgdesc='Runtime for vim and gvim (Parabola rebranded)' - depends=('perl' 'gawk') - backup=('etc/vimrc') - - # Install the runtime split from gvim - install -dm755 "${pkgdir}"/usr/share - mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim - - # Don't forget logtalk.dict - install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict - - # fix FS#17216 - sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - - # patch filetype.vim for better handling of pacman related files - sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - - # rc files - install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc - install -Dm644 "${srcdir}"/parabola.vim \ - "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim - - # rgb.txt file - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ - "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt - - # license - install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime - ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt -} - -# vim:set sw=2 sts=2 et: diff --git a/libre/vim/gvim.desktop b/libre/vim/gvim.desktop deleted file mode 100644 index 675357da5..000000000 --- a/libre/vim/gvim.desktop +++ /dev/null @@ -1,63 +0,0 @@ -[Desktop Entry] -Name=Vi IMproved -Name[bg]=Vi Ðåäàêòîð -Name[ca]=Vi Millorat -Name[da]=Vi forbedret -Name[eo]=VIM -Name[et]=Täiustatud Vi (vim) -Name[fr]=Vi étendu (VIM) -Name[he]=רפושמ Vi -Name[hu]=Vi -Name[is]=Vi IMproved ritillinn -Name[it]=Vi iMproved -Name[no]=Vi IMproved (forbedret VI) -Name[pl]=Poprawiony VI (vim) -Name[ro]=VIM -Name[ru]=Улучшенный VI -Name[sk]=Vi IMpreved -Name[sl]=Izboljšani vi (vim) -Name[sv]=Förbättrad Vi -Name[zh_CN.GB2312]=改进的 Vi -Comment=Powerful text editor with scripting functions and macro recorder -Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè -Comment[ca]=Editor vi potent -Comment[cs]=Mocný textový editor vi -Comment[da]=En kraftig vi tekstbehandler -Comment[de]=Ein leistungsfähiger vi-Editor -Comment[el]=Πανίσχυρος διορθωτής vi -Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn -Comment[es]=Una versión mejorada del editor vi -Comment[et]=Võimas tekstiredaktor vi -Comment[fi]=Tehokas vi-tekstieditori -Comment[fr]=Éditeur vi puissant -Comment[gl]=Potente editor vi -Comment[he]=Vi המצועה בר ךרועה -Comment[hr]=Napredni vi uređivač -Comment[hu]=Vi szövegszerkesztő -Comment[is]=Öflug útgáfa vi ritilsins -Comment[it]=Un editor vi potenziato -Comment[ja]=強力なViエディタ -Comment[lt]=Galingas vi redaktorius -Comment[mk]=Моќен VI уредувач -Comment[nl]=Krachtige vi-editor -Comment[no]=En kraftig vi-redigerer -Comment[no_NY]=Kraftig vi-tekstredigeringsprogram -Comment[pl]=Edytor vi -Comment[pt]=Um poderoso editor de texto -Comment[ro]=Un editor de texte VI, puternic -Comment[ru]=Мощный текстовый редактор vi -Comment[sk]=Silný textový procesor vi -Comment[sl]=Zmogljivi urejevalnik vi -Comment[sr]=Moćni vi editor -Comment[sv]=En kraftfull texteditor -Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ -Comment[tr]=Güçlü vi düzenleyicisi -Comment[uk]=Потужний редактор vi -Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gvim -f %F -Icon=gvim -Type=Application -Terminal=false -X-XClassHintResName=VIM -Categories=Utility;TextEditor; diff --git a/libre/vim/gvim.install b/libre/vim/gvim.install deleted file mode 100644 index 2eaa60550..000000000 --- a/libre/vim/gvim.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/libre/vim/parabola.vim b/libre/vim/parabola.vim deleted file mode 100644 index bc3c1f82e..000000000 --- a/libre/vim/parabola.vim +++ /dev/null @@ -1,27 +0,0 @@ -" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults -" -" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] -" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu] -" -" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION -" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc - -" Normally we use vim-extensions. If you want true vi-compatibility -" remove change the following statements -set nocompatible " Use Vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing - -" Now we set some defaults for the editor -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time - -" Suffixes that get lower priority when doing tab completion for filenames. -" These are files we are not likely to want to edit or read. -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc - - -if has('gui_running') - " Make shift-insert work like in Xterm - map - map! -endif diff --git a/libre/vim/vimrc b/libre/vim/vimrc deleted file mode 100644 index fc67e7eb0..000000000 --- a/libre/vim/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just -" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime -" you can find below. If you wish to change any of those settings, you should -" do it in this file (/etc/vimrc), since parabola.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing parabola.vim since it alters the value of the -" 'compatible' option. - -" This line should not be removed as it ensures that various options are -" properly set to work with the Vim-related packages. -runtime! parabola.vim - -" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual -" and configure vim to your own liking! - -- cgit v1.2.3-54-g00ecf From f21035191fc2036cbf4f59167ad422dbbb477458 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 30 Mar 2014 23:51:08 -0300 Subject: mplayer-libre-37051-2.1: add subversion on makedepends --- libre/mplayer-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 8600ea77f..9c4dd49ab 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -9,7 +9,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=37051 -pkgrel=2 +pkgrel=2.1 arch=('i686' 'x86_64') makedepends=( 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' @@ -17,7 +17,7 @@ makedepends=( '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' + 'libcdio-paranoia' 'opus' 'subversion' ) license=('GPL') url='http://www.mplayerhq.hu/' -- cgit v1.2.3-54-g00ecf From 6220e74b25f00c84b9430ea341d4c7bba083a419 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 31 Mar 2014 18:10:22 -0300 Subject: ogre-libre: remove more nonfree references from libre.patch --- libre/ogre-libre/PKGBUILD | 12 +- libre/ogre-libre/libre.patch | 322 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 304 insertions(+), 30 deletions(-) (limited to 'libre') diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index f91855322..e7bf84fcf 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -45,17 +45,17 @@ makedepends=( ) mksource=( ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} - libre.patch ) source=( https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz + libre.patch ) mksha512sums=( SKIP - e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767 ) sha512sums=( - 9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a + 13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412 + 5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316 ) mksource() { @@ -67,12 +67,14 @@ mksource() { rm -rv Samples/Media/materials/textures/nvidia rm -v Samples/Media/packs/chiropteraDM.{pk3,txt} rm -v CMake/Templates/quakemap{,_d}.cfg.in - patch -Np1 -i $srcdir/libre.patch } prepare() { cd ${pkgbase} + # remove nonfree references + patch -Np1 -i $srcdir/libre.patch + # add symlinks to point to mesa header files cd RenderSystems/GL/include/GL ln -sv /usr/include/GL/gl.h gl.h @@ -146,7 +148,7 @@ package_ogre-libre() { # install license install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html - # remove nonfree files + # remove files only useful for nonfree software rm -vr $pkgdir/usr/lib/OGRE/cmake rm -v $pkgdir/usr/include/OGRE/Example*.h } diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch index 77c32c8d4..e9a1846b1 100644 --- a/libre/ogre-libre/libre.patch +++ b/libre/ogre-libre/libre.patch @@ -1,6 +1,6 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake ---- ogre.orig/CMake/InstallResources.cmake 2014-01-15 01:56:25.549401653 -0200 -+++ ogre/CMake/InstallResources.cmake 2014-01-21 21:24:52.510763877 -0200 +--- ogre.orig/CMake/InstallResources.cmake 2014-03-31 16:44:40.544894640 -0300 ++++ ogre/CMake/InstallResources.cmake 2014-03-31 16:59:12.012359302 -0300 @@ -116,9 +116,6 @@ # create plugins.cfg configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg) @@ -11,7 +11,47 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma # create samples.cfg configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg) configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg) -@@ -219,11 +216,6 @@ +@@ -133,7 +130,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg + ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg + ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg +- ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug + ) + install(FILES +@@ -141,7 +137,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" + ) + install(FILES +@@ -149,7 +144,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo + ) + install(FILES +@@ -157,7 +151,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel + ) + +@@ -168,7 +161,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" + ) + endif() +@@ -219,11 +211,6 @@ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg) configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg) configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg) @@ -23,9 +63,40 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma # create samples.cfg configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg) configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg) +@@ -243,8 +230,6 @@ + configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg) + # create plugins.cfg + configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg) +- # create quakemap.cfg +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg) + # create samples.cfg + configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg) + # create tests.cfg +diff -Nur ogre.orig/CMake/Templates/Android_resources.cfg.in ogre/CMake/Templates/Android_resources.cfg.in +--- ogre.orig/CMake/Templates/Android_resources.cfg.in 2014-03-31 16:44:40.591560636 -0300 ++++ ogre/CMake/Templates/Android_resources.cfg.in 2014-03-31 17:02:01.633252779 -0300 +@@ -12,7 +12,6 @@ + APKFileSystem=/materials/programs/GLSLES + APKFileSystem=/materials/scripts + APKFileSystem=/materials/textures +-APKFileSystem=/materials/textures/nvidia + APKFileSystem=/models + APKFileSystem=/particle + APKFileSystem=/RTShaderLib +diff -Nur ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in ogre/CMake/Templates/SDK_CMakeLists.txt.in +--- ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:44:40.618226919 -0300 ++++ ogre/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:59:35.715351689 -0300 +@@ -245,7 +245,6 @@ + configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY) + configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY) + configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY) +- configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY) + endif () + + if (MINGW) diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in ---- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-01-15 01:56:25.652728172 -0200 -+++ ogre/CMake/Templates/demomedia.wxi.in 2014-01-21 21:49:24.962291640 -0200 +--- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-03-31 16:44:40.628226774 -0300 ++++ ogre/CMake/Templates/demomedia.wxi.in 2014-03-31 16:51:57.408610715 -0300 @@ -295,13 +295,6 @@ @@ -99,9 +170,113 @@ diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demome - \ No newline at end of file + +diff -Nur ogre.orig/CMake/Templates/demos.wxs.in ogre/CMake/Templates/demos.wxs.in +--- ogre.orig/CMake/Templates/demos.wxs.in 2014-03-31 16:44:40.631560060 -0300 ++++ ogre/CMake/Templates/demos.wxs.in 2014-03-31 16:59:50.921799622 -0300 +@@ -39,7 +39,6 @@ + + + +- + + + +diff -Nur ogre.orig/CMake/Templates/resources.cfg.in ogre/CMake/Templates/resources.cfg.in +--- ogre.orig/CMake/Templates/resources.cfg.in 2014-03-31 16:44:40.641559915 -0300 ++++ ogre/CMake/Templates/resources.cfg.in 2014-03-31 17:02:35.802761281 -0300 +@@ -12,7 +12,6 @@ + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures +-FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia + FileSystem=@OGRE_MEDIA_DIR_REL@/models + FileSystem=@OGRE_MEDIA_DIR_REL@/particle + FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia +diff -Nur ogre.orig/CMake/Templates/resources_d.cfg.in ogre/CMake/Templates/resources_d.cfg.in +--- ogre.orig/CMake/Templates/resources_d.cfg.in 2014-03-31 16:44:40.644893200 -0300 ++++ ogre/CMake/Templates/resources_d.cfg.in 2014-03-31 17:02:14.183072260 -0300 +@@ -12,7 +12,6 @@ + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/programs + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/scripts + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures +-FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures/nvidia + FileSystem=@OGRE_MEDIA_DIR_DBG@/models + FileSystem=@OGRE_MEDIA_DIR_DBG@/particle + FileSystem=@OGRE_MEDIA_DIR_DBG@/DeferredShadingMedia +diff -Nur ogre.orig/Samples/BSP/include/BSP.h ogre/Samples/BSP/include/BSP.h +--- ogre.orig/Samples/BSP/include/BSP.h 2014-03-31 16:44:40.718225480 -0300 ++++ ogre/Samples/BSP/include/BSP.h 2014-03-31 16:58:16.993150707 -0300 +@@ -19,7 +19,6 @@ + { + mInfo["Title"] = "BSP"; + mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. " +- "Also demonstrates how to load BSP maps from Quake 3."; + mInfo["Thumbnail"] = "thumb_bsp.png"; + mInfo["Category"] = "Geometry"; + } +@@ -43,27 +42,6 @@ + + protected: + +- void locateResources() +- { +- // load the Quake archive location and map name from a config file +- ConfigFile cf; +- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); +- mArchive = cf.getSetting("Archive"); +- mMap = cf.getSetting("Map"); +- +-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS +- // OS X does not set the working directory relative to the app, +- // In order to make things portable on OS X we need to provide +- // the loading with it's own bundle path location +- if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs +- mArchive = Ogre::String(Ogre::macBundlePath() + "/" + mArchive); +-#endif +- +- // add the Quake archive to the world resource group +- ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip", +- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); +- } +- + void createSceneManager() + { + mSceneMgr = mRoot->createSceneManager("BspSceneManager"); // the BSP scene manager is required for this sample +@@ -108,10 +86,6 @@ + // set a random player starting point + ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); + +- // Quake uses the Z axis as the up axis, so make necessary adjustments +- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); +- mCamera->pitch(Degree(90)); +- + mCamera->setPosition(vp.position); + mCamera->rotate(vp.orientation); + +diff -Nur ogre.orig/Samples/Browser/CMakeLists.txt ogre/Samples/Browser/CMakeLists.txt +--- ogre.orig/Samples/Browser/CMakeLists.txt 2014-03-31 16:44:40.734891905 -0300 ++++ ogre/Samples/Browser/CMakeLists.txt 2014-03-31 16:54:51.716103447 -0300 +@@ -307,8 +307,6 @@ + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg +- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ditto +@@ -323,8 +321,6 @@ + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ditto diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-15 01:56:25.872713663 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-21 22:20:00.343185180 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:44:40.791557758 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:51:57.408610715 -0300 @@ -555,48 +555,6 @@ false false @@ -196,8 +371,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/ \ No newline at end of file + diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-15 01:56:25.872713663 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-21 22:20:41.517291770 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:44:40.808224186 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:51:57.411944001 -0300 @@ -628,9 +628,6 @@ Assets\media @@ -274,8 +449,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/ \ No newline at end of file + diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-15 01:56:25.896045457 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-21 21:53:56.997551091 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:44:40.821557325 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:51:57.415277288 -0300 @@ -4356,21 +4356,6 @@ false false @@ -440,8 +615,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Sample \ No newline at end of file + diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-15 01:56:25.899378571 -0200 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-21 21:54:56.166945128 -0200 +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:44:40.918222604 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:51:57.415277288 -0300 @@ -731,9 +731,6 @@ Assets\media @@ -517,9 +692,31 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogr - \ No newline at end of file + +diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg ogre/Samples/Browser/WinRT.Xaml/resources.cfg +--- ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 16:44:40.771558046 -0300 ++++ ogre/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 17:00:55.510870562 -0300 +@@ -11,7 +11,6 @@ + FileSystem=media/materials/programs + FileSystem=media/materials/scripts + FileSystem=media/materials/textures +-FileSystem=media/materials/textures/nvidia + FileSystem=media/models + FileSystem=media/particle + FileSystem=media/DeferredShadingMedia +diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg +--- ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 16:44:40.771558046 -0300 ++++ ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 17:01:16.207239528 -0300 +@@ -11,7 +11,6 @@ + FileSystem=media/materials/programs + FileSystem=media/materials/scripts + FileSystem=media/materials/textures +-FileSystem=media/materials/textures/nvidia + FileSystem=media/models + FileSystem=media/particle + FileSystem=media/DeferredShadingMedia diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt ---- ogre.orig/Samples/CMakeLists.txt 2014-01-15 01:56:25.932709706 -0200 -+++ ogre/Samples/CMakeLists.txt 2014-01-21 21:23:53.145016405 -0200 +--- ogre.orig/Samples/CMakeLists.txt 2014-03-31 16:44:40.941555601 -0300 ++++ ogre/Samples/CMakeLists.txt 2014-03-31 16:51:57.415277288 -0300 @@ -238,7 +238,6 @@ set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL}) set(OGRE_MEDIA_DIR_REL "Media") @@ -529,9 +726,9 @@ diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP}) add_custom_target(demo_installer diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h ---- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-15 01:56:26.186026332 -0200 -+++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-21 21:51:44.043058960 -0200 -@@ -304,17 +304,6 @@ +--- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:44:41.174885577 -0300 ++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:51:57.415277288 -0300 +@@ -307,17 +307,6 @@ defaultimp.inputScale = 600; defaultimp.minBatchSize = 33; defaultimp.maxBatchSize = 65; @@ -550,8 +747,8 @@ diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/End /*----------------------------------------------------------------------------- diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material ---- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-15 01:56:27.849249967 -0200 -+++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-21 22:24:19.433708607 -0200 +--- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:44:41.678211671 -0300 ++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:51:57.415277288 -0300 @@ -11,36 +11,6 @@ fragment_program_ref TriplanarReferenceHigh_PS { @@ -634,9 +831,9 @@ diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre \ No newline at end of file +} diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h ---- ogre.orig/Samples/Terrain/include/Terrain.h 2014-01-15 01:56:28.209226225 -0200 -+++ ogre/Samples/Terrain/include/Terrain.h 2014-01-21 21:55:51.099952029 -0200 -@@ -533,17 +533,6 @@ +--- ogre.orig/Samples/Terrain/include/Terrain.h 2014-03-31 16:44:42.381534889 -0300 ++++ ogre/Samples/Terrain/include/Terrain.h 2014-03-31 16:51:57.415277288 -0300 +@@ -534,17 +534,6 @@ defaultimp.inputScale = 600; defaultimp.minBatchSize = 33; defaultimp.maxBatchSize = 65; @@ -654,9 +851,21 @@ diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/inclu } +diff -Nur ogre.orig/Tests/CMakeLists.txt ogre/Tests/CMakeLists.txt +--- ogre.orig/Tests/CMakeLists.txt 2014-03-31 16:44:42.431534168 -0300 ++++ ogre/Tests/CMakeLists.txt 2014-03-31 16:55:11.432486511 -0300 +@@ -78,8 +78,6 @@ + ${OGRE_TEST_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg + ${OGRE_TEST_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_TEST_CONTENTS_PATH}/Resources/ + COMMAND ditto + ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/ + COMMAND ditto diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp ---- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-01-15 01:56:28.309219629 -0200 -+++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-01-21 22:31:02.415114645 -0200 +--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:44:42.661530860 -0300 ++++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:51:57.418610574 -0300 @@ -411,16 +411,6 @@ // mTerrain->update(); // updateDelay = 0.3; @@ -692,3 +901,66 @@ diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen // terrain->prepare(imp); // terrain->load(); // +diff -Nur ogre.orig/Tests/VisualTests/Context/CMakeLists.txt ogre/Tests/VisualTests/Context/CMakeLists.txt +--- ogre.orig/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:44:42.681530572 -0300 ++++ ogre/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:55:35.265477026 -0300 +@@ -137,8 +137,6 @@ + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media +diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp +--- ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:44:42.711530141 -0300 ++++ ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:56:35.361279265 -0300 +@@ -2018,47 +2018,6 @@ + addScreenshotFrame(10); + } + //---------------------------------------------------------------------------- +- +-void PlayPen_Bsp::setupContent() +-{ +- // Load Quake3 locations from a file +- ConfigFile cf; +- +- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); +- +- String quakePk3 = cf.getSetting("Archive"); +- String quakeLevel = cf.getSetting("Map"); +- +- //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip"); +- +- ResourceGroupManager::getSingleton().addResourceLocation( +- quakePk3, "Zip", +- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); +- +- // Load world geometry +- //mSceneMgr->setWorldGeometry(quakeLevel); +- +- ResourceGroupManager& rgm = ResourceGroupManager::getSingleton(); +- rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr); +- rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName()); +- rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false); +- +- // modify camera for close work +- mCamera->setNearClipDistance(4); +- mCamera->setFarClipDistance(4000); +- +- // Also change position, and set Quake-type orientation +- // Get random player start point +- ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); +- mCamera->setPosition(vp.position); +- mCamera->pitch(Degree(90)); // Quake uses X/Y horizon, Z up +- mCamera->rotate(vp.orientation); +- // Don't yaw along variable axis, causes leaning +- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); +- +- mCamera->yaw(Ogre::Degree(-90.f)); +-} +-//---------------------------------------------------------------------------- + //---------------------------------------------------------------------------- + + PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh() -- cgit v1.2.3-54-g00ecf