From 52c24c0d5dba2888ba1df28b7f5a4ff946cb3878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 17 Apr 2013 20:34:44 -0300 Subject: linux-libre: updating version * Update 3.8.8 version to i686 and x86_64 * Update 3.8.7 version to mips64el --- libre/linux-libre/PKGBUILD | 10 +++++----- libre/linux-libre/linux-libre.install | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index f0ca4a325..9d1e52de9 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $ +# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'f83582104813c022e6739e12664dbb0c' + 'cc93810441658cdf40a4bc051f8f4774' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '5629a56818c1875bcc77a51c69347d98') + 'fead20edc727fbb89789194eaebb6daa') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 46f383749..c6fa71c97 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.7-1-LIBRE +KERNEL_VERSION=3.8.8-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-2-g168b From 207e873d19a2c1930b0d7a565e009886082b7ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 17 Apr 2013 20:39:58 -0300 Subject: linux-libre-lts: updating version * Update 3.0.74 version to i686 and x86_64 * Update 3.0.73 version to mips64el --- libre/linux-libre-lts/PKGBUILD | 10 +++++----- libre/linux-libre-lts/linux-libre-lts.install | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index df302a20d..f4341cb83 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182731 2013-04-13 15:31:06Z tpowa $ +# $Id: PKGBUILD 183082 2013-04-17 12:40:54Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=73 +_sublevel=74 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.72 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.73 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '846a503d4bacfaca417fbea67aceabc2' + 'a0984b44eba8de48e20357c9c146baf6' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '5d433e634f9744824a5a3122d734e6f6') + '624eacedd2a576161512ffefc1797bc1') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index c3aff92ae..b8118b60d 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.73-1-LIBRE-LTS +KERNEL_VERSION=3.0.74-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-2-g168b From ac47266eff10b90217bceff3ef246faac8057dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 17 Apr 2013 21:11:46 -0300 Subject: lirc-libre-1:0.9.0-42: removing initscripts support and rebuild against linux-libre-3.8.8-1 --- libre/lirc-libre/PKGBUILD | 20 +++-------------- libre/lirc-libre/irexec.conf | 5 ----- libre/lirc-libre/irexecd | 38 -------------------------------- libre/lirc-libre/lircd | 52 -------------------------------------------- libre/lirc-libre/lircd.conf | 8 ------- libre/lirc-libre/lircmd | 36 ------------------------------ 6 files changed, 3 insertions(+), 156 deletions(-) delete mode 100644 libre/lirc-libre/irexec.conf delete mode 100644 libre/lirc-libre/irexecd delete mode 100644 libre/lirc-libre/lircd delete mode 100644 libre/lirc-libre/lircd.conf delete mode 100644 libre/lirc-libre/lircmd (limited to 'libre') diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index bdc8b63c0..0634f6f6c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182068 2013-04-06 09:25:55Z tpowa $ +# $Id: PKGBUILD 183118 2013-04-17 16:51:39Z tpowa $ # Maintainer: Paul Mattal # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=41 +pkgrel=42 epoch=1 _extramodules=extramodules-3.8-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar lirc_atiusb-kfifo.patch kernel-2.6.39.patch linux-3.8.patch - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd + lirc.logrotate lirc.service lircm.service irexec.service lirc.tmpfiles) @@ -82,13 +82,10 @@ package_lirc-utils-libre() { replaces=('lirc-utils') conflicts=('lirc-utils') provides=("lirc-utils=$pkgver") - backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" - cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service @@ -99,12 +96,6 @@ package_lirc-utils-libre() { # install the logrotate config install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - # install conf.d file - install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" - - # install conf.d file - install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" - install -d "${pkgdir}/etc/lirc" # remove built modules @@ -116,12 +107,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '1f8b104a2365d9f93404b143f499059b' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb' 'dab8a73bcc5fd5479d8750493d8d97dc' 'c2e20fe68b034df752dba2773db16ebe' '07131d117fcfe9dcd50c453c3a5e9531' diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf deleted file mode 100644 index f911c7515..000000000 --- a/libre/lirc-libre/irexec.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters for irexec daemon (path to lircrc) -# - -IREXEC_OPTS="" \ No newline at end of file diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd deleted file mode 100644 index a64b033a5..000000000 --- a/libre/lirc-libre/irexecd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/irexec.conf - -PID=`pidof -o %PPID /usr/bin/irexec` -case "$1" in - start) - stat_busy "Starting IREXEC Daemon" - [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon irexecd - stat_done - fi - ;; - stop) - stat_busy "Stopping IREXEC Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irexecd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd deleted file mode 100644 index e9739b36e..000000000 --- a/libre/lirc-libre/lircd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/lircd.conf - -PID=$(pidof -o %PPID /usr/sbin/lircd) -LIRCD_SYMLINKFILE=/dev/lircd -LIRCD_SOCKET=/var/run/lirc/lircd -case "$1" in - start) - stat_busy "Starting LIRC Daemon" - [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null - rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE - if [ $? -ne 0 ]; then - stat_fail - exit 0 - fi - [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" - [ -z "$PID" ] && - if [ -n "$LIRC_DEVICE" ] ; then - eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - else - /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - fi - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircd - stat_done - fi - ;; - stop) - stat_busy "Stopping LIRC Daemon" - rm -f $LIRCD_SYMLINKFILE - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 start|stop|restart" -esac -exit 0 diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf deleted file mode 100644 index 760dab065..000000000 --- a/libre/lirc-libre/lircd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters for lirc daemon -# - -LIRC_DEVICE="/dev/lirc0" -LIRC_DRIVER="" -LIRC_EXTRAOPTS="" -LIRC_CONFIGFILE="" diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd deleted file mode 100644 index 220c47c9c..000000000 --- a/libre/lirc-libre/lircmd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/lircmd` -case "$1" in - start) - stat_busy "Starting lircmd Daemon" - [ -z "$PID" ] && /usr/sbin/lircmd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircmd - stat_done - fi - ;; - stop) - stat_busy "Stopping lircmd Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircmd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -- cgit v1.2.3-2-g168b From 74d2e23e90ca6319fc5af7480a73ef56200ea2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 17 Apr 2013 22:45:36 -0300 Subject: virtualbox-libre-modules-4.2.12-2: rebuild against linux-libre 3.8.8 --- libre/virtualbox-libre-modules/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index d6d50f425..59816a051 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 _extramodules=extramodules-3.8-LIBRE -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -- cgit v1.2.3-2-g168b From 553b090cd8b6e8db74b08a4751b18d7bd5c84478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 17 Apr 2013 22:48:18 -0300 Subject: linux-libre{,-lts}-kmod-alx: rebuild against last kernel versions --- libre/linux-libre-kmod-alx/PKGBUILD | 4 ++-- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index d6dc1c328..6c04db17b 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.7 +_kernver=3.8.8 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=13 +pkgrel=14 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 1963f2536..d7902119f 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.73 +_kernver=3.0.74 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=11 +pkgrel=12 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' -- cgit v1.2.3-2-g168b From f704281a398b4d8a0fb41218d3c604af577c98ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 18 Apr 2013 15:03:34 -0300 Subject: cinelerra-cv-libre: adding new package to [libre] repo --- libre/cinelerra-cv-libre/PKGBUILD | 86 +++++++++++++++ libre/cinelerra-cv-libre/ffmpeg_api.patch | 163 ++++++++++++++++++++++++++++ libre/cinelerra-cv-libre/v4l1_removal.patch | 125 +++++++++++++++++++++ 3 files changed, 374 insertions(+) create mode 100644 libre/cinelerra-cv-libre/PKGBUILD create mode 100644 libre/cinelerra-cv-libre/ffmpeg_api.patch create mode 100644 libre/cinelerra-cv-libre/v4l1_removal.patch (limited to 'libre') diff --git a/libre/cinelerra-cv-libre/PKGBUILD b/libre/cinelerra-cv-libre/PKGBUILD new file mode 100644 index 000000000..c45c5f0fa --- /dev/null +++ b/libre/cinelerra-cv-libre/PKGBUILD @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Ray Rashif +# Contributor: Daniel J Griffiths +# Contributor: Jaroslaw Swierczynski +# Contributor: Alexander Rødseth +# Maintainer (Parabola): André Silva + +_pkgname=cinelerra-cv +pkgname=cinelerra-cv-libre +pkgver=2.2 +_gitrel=2.2.0 +pkgrel=14 +epoch=1 +pkgdesc="Professional video editing and compositing environment, without nonfree faac support" +arch=('x86_64' 'i686' 'mips64el') +url="http://cinelerra.org/" +license=('GPL') +depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv' + 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu' + 'ffmpeg' 'faad2' 'openexr>=2.0.0') +makedepends=('git' 'nasm' 'mesa') +options=('!libtool') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("$_pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel" + 'v4l1_removal.patch' + 'ffmpeg_api.patch') +md5sums=('SKIP' + 'bfa85e20809429d88eba4ab83e569612' + 'b05ec2fb54e7d02f6167525417802111') + +_confit() { + ./configure --prefix=/usr \ + --with-buildinfo=git/recompile \ + --with-external-ffmpeg \ + --enable-opengl \ + --disable-esd $@ +} + +prepare() { + cd "$srcdir/$_pkgname" + + # v4l1 removal patch + patch -Np1 -i "$srcdir/v4l1_removal.patch" + + # new ffmpeg api patch + patch -Np1 -i "$srcdir/ffmpeg_api.patch" + + # TODO: check if this is still needed (not sure what it does) --schiv + sed -i -e '/Debian/d' admin/nasm + + # if you don't need OpenGL comment out the next line (and no glu/mesa dep) + # TODO: kind of forgot about the specifics of this one, recheck --schiv + sed -i '/\/X11R6/s///' configure.in +} + +build() { + cd "$srcdir/$_pkgname" + + # gcc 4.6 workaround + export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS" + export CPPFLAGS="$CFLAGS" + + # remove executable stack + export LDFLAGS+=" -Wl,-z,noexecstack" + + ./autogen.sh + + # TODO: check if this is still needed (forgot why at all) --schiv + if [ "$CARCH" = 'x86_64' ]; then + _confit --disable-mmx + else + _confit --enable-mmx + fi + + make +} + +package() { + cd "$srcdir/$_pkgname" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/cinelerra-cv-libre/ffmpeg_api.patch b/libre/cinelerra-cv-libre/ffmpeg_api.patch new file mode 100644 index 000000000..d9747476c --- /dev/null +++ b/libre/cinelerra-cv-libre/ffmpeg_api.patch @@ -0,0 +1,163 @@ +diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C +index 6ab6047..7cde503 100644 +--- a/cinelerra/ffmpeg.C ++++ b/cinelerra/ffmpeg.C +@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) { + + int FFMPEG::init(char *codec_string) { + +- avcodec_init(); + avcodec_register_all(); + + CodecID id = codec_id(codec_string); +@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame *frame_out) { + + // NOTE: frame must already have data space allocated + ++ AVPacket pkt; + got_picture = 0; +- int length = avcodec_decode_video(context, ++ av_init_packet( &pkt ); ++ pkt.data = data; ++ pkt.size = data_size; ++ int length = avcodec_decode_video2(context, + picture, + &got_picture, +- data, +- data_size); ++ &pkt); + + if (length < 0) { + printf("FFMPEG::decode error decoding frame\n"); +diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C +index a1ef61e..e56705f 100644 +--- a/cinelerra/fileac3.C ++++ b/cinelerra/fileac3.C +@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr) + + if(wr) + { +- avcodec_init(); + avcodec_register_all(); + codec = avcodec_find_encoder(CODEC_ID_AC3); + if(!codec) +diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c +index 81cb72b..67bcab8 100644 +--- a/quicktime/mpeg4.c ++++ b/quicktime/mpeg4.c +@@ -629,7 +629,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + if(!ffmpeg_initialized) + { + ffmpeg_initialized = 1; +- avcodec_init(); + avcodec_register_all(); + } + +@@ -674,7 +673,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + context->error_resilience = FF_ER_CAREFUL; + #else +- context->error_recognition = FF_ER_CAREFUL; ++ context->err_recognition = AV_EF_CRCCHECK; + #endif + context->error_concealment = 3; + context->frame_skip_cmp = FF_CMP_DCTMAX; +@@ -699,7 +698,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + context->profile= FF_PROFILE_UNKNOWN; + context->rc_buffer_aggressivity = 1.0; + context->level= FF_LEVEL_UNKNOWN; +- context->flags |= CODEC_FLAG_H263P_UMV; + context->flags |= CODEC_FLAG_AC_PRED; + + // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg... +@@ -717,10 +715,8 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) + (codec->ffmpeg_id == CODEC_ID_MPEG4 || + codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO || + codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO || +- codec->ffmpeg_id == CODEC_ID_H263P || +- codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) ++ codec->ffmpeg_id == CODEC_ID_H263P)) + { +- avcodec_thread_init(context, file->cpus); + context->thread_count = file->cpus; + } + +diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c +index 8c532c2..a2b51e9 100644 +--- a/quicktime/qtffmpeg.c ++++ b/quicktime/qtffmpeg.c +@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, + if(!ffmpeg_initialized) + { + ffmpeg_initialized = 1; +- avcodec_init(); + avcodec_register_all(); + } + +@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, + (ffmpeg_id == CODEC_ID_MPEG4 || + ffmpeg_id == CODEC_ID_MPEG1VIDEO || + ffmpeg_id == CODEC_ID_MPEG2VIDEO || +- ffmpeg_id == CODEC_ID_H263P || +- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) ++ ffmpeg_id == CODEC_ID_H263P)) + { +- avcodec_thread_init(context, cpus); + context->thread_count = cpus; + } + if(avcodec_open(context, +@@ -181,6 +178,7 @@ static int decode_wrapper(quicktime_t *file, + + if(!result) + { ++ AVPacket pkt; + + + // No way to determine if there was an error based on nonzero status. +@@ -189,11 +187,13 @@ static int decode_wrapper(quicktime_t *file, + ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */; + else + ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT; +- result = avcodec_decode_video(ffmpeg->decoder_context[current_field], ++ av_init_packet( &pkt ); ++ pkt.data = ffmpeg->work_buffer; ++ pkt.size = bytes + header_bytes; ++ result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], + &ffmpeg->picture[current_field], + &got_picture, +- ffmpeg->work_buffer, +- bytes + header_bytes); ++ &pkt); + + + +diff --git a/quicktime/wma.c b/quicktime/wma.c +index c045741..abc2dc8 100644 +--- a/quicktime/wma.c ++++ b/quicktime/wma.c +@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_map_t *track_map, + if(!ffmpeg_initialized) + { + ffmpeg_initialized = 1; +- avcodec_init(); + avcodec_register_all(); + } + +@@ -195,11 +194,14 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk + chunk_size); + #else + bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE; +- result = avcodec_decode_audio2(codec->decoder_context, ++ AVPacket pkt; ++ av_init_packet( &pkt ); ++ pkt.data = codec->packet_buffer; ++ pkt.size = chunk_size; ++ result = avcodec_decode_audio3(codec->decoder_context, + (int16_t*)(codec->work_buffer + codec->output_size * sample_size), + &bytes_decoded, +- codec->packet_buffer, +- chunk_size); ++ &pkt); + #endif + + pthread_mutex_unlock(&ffmpeg_lock); diff --git a/libre/cinelerra-cv-libre/v4l1_removal.patch b/libre/cinelerra-cv-libre/v4l1_removal.patch new file mode 100644 index 000000000..9df4004fe --- /dev/null +++ b/libre/cinelerra-cv-libre/v4l1_removal.patch @@ -0,0 +1,125 @@ +http://bugs.cinelerra.org/ticket/949 +https://bugs.gentoo.org/show_bug.cgi?id=361709 + +diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C +--- cinelerra.orig//cinelerra/channelpicker.C 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/channelpicker.C 2011-02-17 13:31:30.147880002 -0500 +@@ -39,7 +39,7 @@ + #include "recordgui.h" + #include "recordmonitor.h" + #include "theme.h" +-#include "vdevicebuz.h" ++//#include "vdevicebuz.h" + #include "vdeviceprefs.h" + #include "videodevice.h" + +@@ -280,7 +280,7 @@ + // printf("PrefsChannelPicker::PrefsChannelPicker 1\n"); + this->mwindow = mwindow; + this->prefs = prefs; +- VDeviceBUZ::get_inputs(&input_sources); ++// VDeviceBUZ::get_inputs(&input_sources); + } + + PrefsChannelPicker::~PrefsChannelPicker() +diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am +--- cinelerra.orig//cinelerra/Makefile.am 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/Makefile.am 2011-02-17 13:31:30.147880002 -0500 +@@ -305,10 +305,8 @@ + vattachmentpoint.C \ + vautomation.C \ + vdevicebase.C \ +- vdevicebuz.C \ + vdevicedvb.C \ + vdeviceprefs.C \ +- vdevicev4l.C \ + vdevicev4l2.C \ + vdevicev4l2jpeg.C \ + vdevicex11.C \ +diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake +--- cinelerra.orig//cinelerra/reversemake 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/reversemake 2011-02-17 13:31:30.151880002 -0500 +@@ -32,10 +32,8 @@ + make $OBJDIR/vedits.o + make $OBJDIR/vedit.o + make $OBJDIR/vdevicex11.o +-make $OBJDIR/vdevicev4l.o + make $OBJDIR/vdeviceprefs.o + make $OBJDIR/vdevicelml.o +-make $OBJDIR/vdevicebuz.o + make $OBJDIR/vdevicebase.o + make $OBJDIR/vdevice1394.o + make $OBJDIR/vautomation.o +diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C +--- cinelerra.orig//cinelerra/videodevice.C 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/videodevice.C 2011-02-17 13:41:53.239880001 -0500 +@@ -39,9 +39,9 @@ + #ifdef HAVE_FIREWIRE + #include "vdevice1394.h" + #endif +-#include "vdevicebuz.h" ++//#include "vdevicebuz.h" + #include "vdevicedvb.h" +-#include "vdevicev4l.h" ++//#include "vdevicev4l.h" + #include "vdevicev4l2.h" + #include "vdevicev4l2jpeg.h" + #include "vdevicex11.h" +@@ -203,7 +203,6 @@ + result = input_base->open_input(); + break; + +- + #ifdef HAVE_VIDEO4LINUX2 + case VIDEO4LINUX2: + new_device_base(); +@@ -250,8 +249,8 @@ + { + switch(in_config->driver) + { +- case VIDEO4LINUX: +- return input_base = new VDeviceV4L(this); ++ //case VIDEO4LINUX: ++ // return input_base = new VDeviceV4L(this); + + #ifdef HAVE_VIDEO4LINUX2 + case VIDEO4LINUX2: +@@ -264,8 +263,8 @@ + case SCREENCAPTURE: + return input_base = new VDeviceX11(this, 0); + +- case CAPTURE_BUZ: +- return input_base = new VDeviceBUZ(this); ++ //case CAPTURE_BUZ: ++ // return input_base = new VDeviceBUZ(this); + + #ifdef HAVE_FIREWIRE + case CAPTURE_FIREWIRE: +@@ -662,9 +661,9 @@ + //printf("VideoDevice::open_output 1 %d\n", out_config->driver); + switch(out_config->driver) + { +- case PLAYBACK_BUZ: +- output_base = new VDeviceBUZ(this); +- break; ++ //case PLAYBACK_BUZ: ++ // output_base = new VDeviceBUZ(this); ++ // break; + case PLAYBACK_X11: + case PLAYBACK_X11_XV: + case PLAYBACK_X11_GL: +diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h +--- cinelerra.orig//cinelerra/videodevice.h 2010-11-24 18:18:03.000000000 -0500 ++++ cinelerra/cinelerra/videodevice.h 2011-02-17 13:31:30.167880002 -0500 +@@ -40,9 +40,9 @@ + #include "thread.h" + #include "picture.inc" + #include "vdevicebase.inc" +-#include "vdevicebuz.inc" ++//#include "vdevicebuz.inc" + #include "vdevicelml.inc" +-#include "vdevicev4l.inc" ++//#include "vdevicev4l.inc" + #include "vdevicex11.inc" + #include "videoconfig.inc" + #include "videowindow.inc" -- cgit v1.2.3-2-g168b From 4741203243ff5ff85f382164f524cc6d2598c339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 18 Apr 2013 16:23:04 -0300 Subject: cinelerra-cv-libre: remove package due that need nonfree faac to build --- libre/cinelerra-cv-libre/PKGBUILD | 86 --------------- libre/cinelerra-cv-libre/ffmpeg_api.patch | 163 ---------------------------- libre/cinelerra-cv-libre/v4l1_removal.patch | 125 --------------------- 3 files changed, 374 deletions(-) delete mode 100644 libre/cinelerra-cv-libre/PKGBUILD delete mode 100644 libre/cinelerra-cv-libre/ffmpeg_api.patch delete mode 100644 libre/cinelerra-cv-libre/v4l1_removal.patch (limited to 'libre') diff --git a/libre/cinelerra-cv-libre/PKGBUILD b/libre/cinelerra-cv-libre/PKGBUILD deleted file mode 100644 index c45c5f0fa..000000000 --- a/libre/cinelerra-cv-libre/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif -# Contributor: Daniel J Griffiths -# Contributor: Jaroslaw Swierczynski -# Contributor: Alexander Rødseth -# Maintainer (Parabola): André Silva - -_pkgname=cinelerra-cv -pkgname=cinelerra-cv-libre -pkgver=2.2 -_gitrel=2.2.0 -pkgrel=14 -epoch=1 -pkgdesc="Professional video editing and compositing environment, without nonfree faac support" -arch=('x86_64' 'i686' 'mips64el') -url="http://cinelerra.org/" -license=('GPL') -depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv' - 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu' - 'ffmpeg' 'faad2' 'openexr>=2.0.0') -makedepends=('git' 'nasm' 'mesa') -options=('!libtool') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -source=("$_pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel" - 'v4l1_removal.patch' - 'ffmpeg_api.patch') -md5sums=('SKIP' - 'bfa85e20809429d88eba4ab83e569612' - 'b05ec2fb54e7d02f6167525417802111') - -_confit() { - ./configure --prefix=/usr \ - --with-buildinfo=git/recompile \ - --with-external-ffmpeg \ - --enable-opengl \ - --disable-esd $@ -} - -prepare() { - cd "$srcdir/$_pkgname" - - # v4l1 removal patch - patch -Np1 -i "$srcdir/v4l1_removal.patch" - - # new ffmpeg api patch - patch -Np1 -i "$srcdir/ffmpeg_api.patch" - - # TODO: check if this is still needed (not sure what it does) --schiv - sed -i -e '/Debian/d' admin/nasm - - # if you don't need OpenGL comment out the next line (and no glu/mesa dep) - # TODO: kind of forgot about the specifics of this one, recheck --schiv - sed -i '/\/X11R6/s///' configure.in -} - -build() { - cd "$srcdir/$_pkgname" - - # gcc 4.6 workaround - export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS" - export CPPFLAGS="$CFLAGS" - - # remove executable stack - export LDFLAGS+=" -Wl,-z,noexecstack" - - ./autogen.sh - - # TODO: check if this is still needed (forgot why at all) --schiv - if [ "$CARCH" = 'x86_64' ]; then - _confit --disable-mmx - else - _confit --enable-mmx - fi - - make -} - -package() { - cd "$srcdir/$_pkgname" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/cinelerra-cv-libre/ffmpeg_api.patch b/libre/cinelerra-cv-libre/ffmpeg_api.patch deleted file mode 100644 index d9747476c..000000000 --- a/libre/cinelerra-cv-libre/ffmpeg_api.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C -index 6ab6047..7cde503 100644 ---- a/cinelerra/ffmpeg.C -+++ b/cinelerra/ffmpeg.C -@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) { - - int FFMPEG::init(char *codec_string) { - -- avcodec_init(); - avcodec_register_all(); - - CodecID id = codec_id(codec_string); -@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame *frame_out) { - - // NOTE: frame must already have data space allocated - -+ AVPacket pkt; - got_picture = 0; -- int length = avcodec_decode_video(context, -+ av_init_packet( &pkt ); -+ pkt.data = data; -+ pkt.size = data_size; -+ int length = avcodec_decode_video2(context, - picture, - &got_picture, -- data, -- data_size); -+ &pkt); - - if (length < 0) { - printf("FFMPEG::decode error decoding frame\n"); -diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C -index a1ef61e..e56705f 100644 ---- a/cinelerra/fileac3.C -+++ b/cinelerra/fileac3.C -@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr) - - if(wr) - { -- avcodec_init(); - avcodec_register_all(); - codec = avcodec_find_encoder(CODEC_ID_AC3); - if(!codec) -diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c -index 81cb72b..67bcab8 100644 ---- a/quicktime/mpeg4.c -+++ b/quicktime/mpeg4.c -@@ -629,7 +629,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -674,7 +673,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - context->error_resilience = FF_ER_CAREFUL; - #else -- context->error_recognition = FF_ER_CAREFUL; -+ context->err_recognition = AV_EF_CRCCHECK; - #endif - context->error_concealment = 3; - context->frame_skip_cmp = FF_CMP_DCTMAX; -@@ -699,7 +698,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - context->profile= FF_PROFILE_UNKNOWN; - context->rc_buffer_aggressivity = 1.0; - context->level= FF_LEVEL_UNKNOWN; -- context->flags |= CODEC_FLAG_H263P_UMV; - context->flags |= CODEC_FLAG_AC_PRED; - - // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg... -@@ -717,10 +715,8 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - (codec->ffmpeg_id == CODEC_ID_MPEG4 || - codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO || - codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO || -- codec->ffmpeg_id == CODEC_ID_H263P || -- codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) -+ codec->ffmpeg_id == CODEC_ID_H263P)) - { -- avcodec_thread_init(context, file->cpus); - context->thread_count = file->cpus; - } - -diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c -index 8c532c2..a2b51e9 100644 ---- a/quicktime/qtffmpeg.c -+++ b/quicktime/qtffmpeg.c -@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, - (ffmpeg_id == CODEC_ID_MPEG4 || - ffmpeg_id == CODEC_ID_MPEG1VIDEO || - ffmpeg_id == CODEC_ID_MPEG2VIDEO || -- ffmpeg_id == CODEC_ID_H263P || -- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) -+ ffmpeg_id == CODEC_ID_H263P)) - { -- avcodec_thread_init(context, cpus); - context->thread_count = cpus; - } - if(avcodec_open(context, -@@ -181,6 +178,7 @@ static int decode_wrapper(quicktime_t *file, - - if(!result) - { -+ AVPacket pkt; - - - // No way to determine if there was an error based on nonzero status. -@@ -189,11 +187,13 @@ static int decode_wrapper(quicktime_t *file, - ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */; - else - ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT; -- result = avcodec_decode_video(ffmpeg->decoder_context[current_field], -+ av_init_packet( &pkt ); -+ pkt.data = ffmpeg->work_buffer; -+ pkt.size = bytes + header_bytes; -+ result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], - &ffmpeg->picture[current_field], - &got_picture, -- ffmpeg->work_buffer, -- bytes + header_bytes); -+ &pkt); - - - -diff --git a/quicktime/wma.c b/quicktime/wma.c -index c045741..abc2dc8 100644 ---- a/quicktime/wma.c -+++ b/quicktime/wma.c -@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_map_t *track_map, - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -195,11 +194,14 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk - chunk_size); - #else - bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE; -- result = avcodec_decode_audio2(codec->decoder_context, -+ AVPacket pkt; -+ av_init_packet( &pkt ); -+ pkt.data = codec->packet_buffer; -+ pkt.size = chunk_size; -+ result = avcodec_decode_audio3(codec->decoder_context, - (int16_t*)(codec->work_buffer + codec->output_size * sample_size), - &bytes_decoded, -- codec->packet_buffer, -- chunk_size); -+ &pkt); - #endif - - pthread_mutex_unlock(&ffmpeg_lock); diff --git a/libre/cinelerra-cv-libre/v4l1_removal.patch b/libre/cinelerra-cv-libre/v4l1_removal.patch deleted file mode 100644 index 9df4004fe..000000000 --- a/libre/cinelerra-cv-libre/v4l1_removal.patch +++ /dev/null @@ -1,125 +0,0 @@ -http://bugs.cinelerra.org/ticket/949 -https://bugs.gentoo.org/show_bug.cgi?id=361709 - -diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C ---- cinelerra.orig//cinelerra/channelpicker.C 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/channelpicker.C 2011-02-17 13:31:30.147880002 -0500 -@@ -39,7 +39,7 @@ - #include "recordgui.h" - #include "recordmonitor.h" - #include "theme.h" --#include "vdevicebuz.h" -+//#include "vdevicebuz.h" - #include "vdeviceprefs.h" - #include "videodevice.h" - -@@ -280,7 +280,7 @@ - // printf("PrefsChannelPicker::PrefsChannelPicker 1\n"); - this->mwindow = mwindow; - this->prefs = prefs; -- VDeviceBUZ::get_inputs(&input_sources); -+// VDeviceBUZ::get_inputs(&input_sources); - } - - PrefsChannelPicker::~PrefsChannelPicker() -diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am ---- cinelerra.orig//cinelerra/Makefile.am 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/Makefile.am 2011-02-17 13:31:30.147880002 -0500 -@@ -305,10 +305,8 @@ - vattachmentpoint.C \ - vautomation.C \ - vdevicebase.C \ -- vdevicebuz.C \ - vdevicedvb.C \ - vdeviceprefs.C \ -- vdevicev4l.C \ - vdevicev4l2.C \ - vdevicev4l2jpeg.C \ - vdevicex11.C \ -diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake ---- cinelerra.orig//cinelerra/reversemake 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/reversemake 2011-02-17 13:31:30.151880002 -0500 -@@ -32,10 +32,8 @@ - make $OBJDIR/vedits.o - make $OBJDIR/vedit.o - make $OBJDIR/vdevicex11.o --make $OBJDIR/vdevicev4l.o - make $OBJDIR/vdeviceprefs.o - make $OBJDIR/vdevicelml.o --make $OBJDIR/vdevicebuz.o - make $OBJDIR/vdevicebase.o - make $OBJDIR/vdevice1394.o - make $OBJDIR/vautomation.o -diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C ---- cinelerra.orig//cinelerra/videodevice.C 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/videodevice.C 2011-02-17 13:41:53.239880001 -0500 -@@ -39,9 +39,9 @@ - #ifdef HAVE_FIREWIRE - #include "vdevice1394.h" - #endif --#include "vdevicebuz.h" -+//#include "vdevicebuz.h" - #include "vdevicedvb.h" --#include "vdevicev4l.h" -+//#include "vdevicev4l.h" - #include "vdevicev4l2.h" - #include "vdevicev4l2jpeg.h" - #include "vdevicex11.h" -@@ -203,7 +203,6 @@ - result = input_base->open_input(); - break; - -- - #ifdef HAVE_VIDEO4LINUX2 - case VIDEO4LINUX2: - new_device_base(); -@@ -250,8 +249,8 @@ - { - switch(in_config->driver) - { -- case VIDEO4LINUX: -- return input_base = new VDeviceV4L(this); -+ //case VIDEO4LINUX: -+ // return input_base = new VDeviceV4L(this); - - #ifdef HAVE_VIDEO4LINUX2 - case VIDEO4LINUX2: -@@ -264,8 +263,8 @@ - case SCREENCAPTURE: - return input_base = new VDeviceX11(this, 0); - -- case CAPTURE_BUZ: -- return input_base = new VDeviceBUZ(this); -+ //case CAPTURE_BUZ: -+ // return input_base = new VDeviceBUZ(this); - - #ifdef HAVE_FIREWIRE - case CAPTURE_FIREWIRE: -@@ -662,9 +661,9 @@ - //printf("VideoDevice::open_output 1 %d\n", out_config->driver); - switch(out_config->driver) - { -- case PLAYBACK_BUZ: -- output_base = new VDeviceBUZ(this); -- break; -+ //case PLAYBACK_BUZ: -+ // output_base = new VDeviceBUZ(this); -+ // break; - case PLAYBACK_X11: - case PLAYBACK_X11_XV: - case PLAYBACK_X11_GL: -diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h ---- cinelerra.orig//cinelerra/videodevice.h 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/videodevice.h 2011-02-17 13:31:30.167880002 -0500 -@@ -40,9 +40,9 @@ - #include "thread.h" - #include "picture.inc" - #include "vdevicebase.inc" --#include "vdevicebuz.inc" -+//#include "vdevicebuz.inc" - #include "vdevicelml.inc" --#include "vdevicev4l.inc" -+//#include "vdevicev4l.inc" - #include "vdevicex11.inc" - #include "videoconfig.inc" - #include "videowindow.inc" -- cgit v1.2.3-2-g168b From cc4a12534e62017a03f6ab3ef77e3554799e1ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 18 Apr 2013 23:40:10 -0300 Subject: virtualbox-libre-modules-lts-4.2.12-2: rebuild against linux-libre-lts-3.0.74-1 --- libre/virtualbox-libre-modules-lts/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index a9464f1fd..172e318c5 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -- cgit v1.2.3-2-g168b From 6d4cc1a4012c2cf275ab80d36b1add4c6c79a4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 19 Apr 2013 10:03:56 -0300 Subject: ice{cat,weasel}-noscript-2.6.6-1: updating version --- libre/icecat-noscript/PKGBUILD | 4 ++-- libre/iceweasel-noscript/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 8d58da41c..61840c4df 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.5.9 +pkgver=2.6.6 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=('ea50b76dd18c1f714359a095b2f00d6a') +md5sums=('a018efb1fe0f722ff307382791bf3c98') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 330402ed2..999131a86 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.5.9 +pkgver=2.6.6 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=('ea50b76dd18c1f714359a095b2f00d6a') +md5sums=('a018efb1fe0f722ff307382791bf3c98') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` -- cgit v1.2.3-2-g168b From 5df395d77f4c88fa98b6aa680fb601662d16ae3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 19 Apr 2013 11:05:26 -0300 Subject: spectrwm-libre-2.2.0-1: updating version --- libre/spectrwm-libre/PKGBUILD | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'libre') diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index a5a9b9b50..d873da4f7 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -4,9 +4,9 @@ _pkgname=spectrwm pkgname=spectrwm-libre -pkgver=2.1.0 +pkgver=2.2.0 pkgrel=1 -pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way (without unfree profont support)" +pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') url="http://www.spectrwm.org" _watch="https://opensource.conformal.com/snapshots/spectrwm/" @@ -14,14 +14,14 @@ license=('custom:ISC') depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor') replaces=('spectrwm' 'scrotwm') conflicts=('spectrwm') -provides=("spectrwm=${pkgver}") +provides=("spectrwm=$pkgver") makedepends=('libxt') -optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') +optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font') backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('cd0ca423445bdc5a74528ca23166449b' +md5sums=('c572727b5fb9fe3674c03a7e51d191c4' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e') @@ -32,7 +32,12 @@ build() { sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf + # crashes if defaults can't be found, use smaller defaults sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf + #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf + + # see spectrwm FS#403 + sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c cd linux make PREFIX="/usr" -- cgit v1.2.3-2-g168b From a596876732779de6a2665481b2200dd5d14f168a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 21 Apr 2013 12:22:49 -0300 Subject: kdelibs-libre-4.10.2-3: rebuild against openexr-2.0.0 and docboox-xsl --- libre/kdelibs-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index d8d648b3b..86d209821 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181384 2013-04-04 03:32:27Z svenstaro $ +# $Id: PKGBUILD 183303 2013-04-21 09:43:18Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.2 -pkgrel=1 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' -- cgit v1.2.3-2-g168b From 826065907dbfea4e0fe516d1f4946010ea582567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 21 Apr 2013 12:24:04 -0300 Subject: kdebase-runtime-libre-4.10.2-3: Rebuild against openexr-2.0.0, Add samba build fix --- libre/kdebase-runtime-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 441852591..ec3bc1365 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre pkgver=4.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -49,7 +49,7 @@ build() { -DKDE4_BUILD_TESTS=OFF \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_QNtrack=OFF + -DWITH_QNtrack=OFF -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 make } -- cgit v1.2.3-2-g168b From acb30e290deef89c2e0777be75b4f56007ebe97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 21 Apr 2013 12:27:37 -0300 Subject: texlive packages: updating version and rebuilding against some dependencies * texlive-bin-libre-2012.0-10: poppler rebuild * texlive-core-libre-2012.29661-1: updating version * texlive-fontsextra-libre-2012.29646-1: updating version * texlive-latexextra-libre-2012.29701-1: updating version --- libre/texlive-bin-libre/PKGBUILD | 6 +++--- libre/texlive-core-libre/PKGBUILD | 8 ++++---- libre/texlive-core-libre/texlive-core.maps | 4 ++-- libre/texlive-fontsextra-libre/PKGBUILD | 8 ++++---- libre/texlive-fontsextra-libre/texlive-fontsextra.maps | 7 +++++-- libre/texlive-latexextra-libre/PKGBUILD | 9 +++++---- 6 files changed, 23 insertions(+), 19 deletions(-) (limited to 'libre') diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 674e047bf..30dd997be 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180321 2013-03-20 07:47:12Z remy $ +# $Id: PKGBUILD 183235 2013-04-18 23:55:16Z remy $ # Maintainer: Rémy Oudompheng # Contributor: francois # Maintainer (Parabola): Michał Masłowski @@ -6,8 +6,8 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=8 -pkgdesc="TeX Live binaries, Parabola rebranded" +pkgrel=10 +pkgdesc="TeX Live binaries, without biber (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 1e3d5534b..92d5b0464 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -4,10 +4,10 @@ pkgname=texlive-core-libre _pkgname=texlive-core -pkgver=2012.28273 +pkgver=2012.29661 _revnr=${pkgver#2012.} pkgrel=1 -pkgdesc="TeX Live core distribution" +pkgdesc="TeX Live core distribution, without nonfree packages" license=('GPL') arch=(any) depends=('texlive-bin-libre') @@ -30,8 +30,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" options=(!strip) install=texlive.install #backup=(etc/texmf/tex/context/config/cont-usr.tex) -md5sums=('42ce6cf5a7728f2ebb9a1a2bbf9dc4ed' - '82c03f7226e1df4440f30c89c05ee653') +md5sums=('4126fad75c577f5b067e612214039c93' + '306ab28bb9b070fc3e40d86d28ea7e8e') build() { cd "$srcdir" diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps index 013f15e94..8d86bfad1 100644 --- a/libre/texlive-core-libre/texlive-core.maps +++ b/libre/texlive-core-libre/texlive-core.maps @@ -1,5 +1,7 @@ Map euler.map Map charter.map +Map cs-charter.map +Map csfonts.map Map fpls.map Map l7x-urwvn.map Map lm.map @@ -30,8 +32,6 @@ MixedMap cm-super-x2.map MixedMap cm.map MixedMap cmextra.map MixedMap cmtext-bsr-interpolated.map -MixedMap csother.map -MixedMap cstext.map MixedMap cyrillic.map MixedMap eurosym.map MixedMap latxfont.map diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index a445de005..a20278d59 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -4,10 +4,10 @@ pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra -pkgver=2012.28268 +pkgver=2012.29646 _revnr=${pkgver#2012.} pkgrel=1 -pkgdesc="TeX Live - all sorts of extra fonts" +pkgdesc="TeX Live - all sorts of extra fonts, without nonfree packages" license=('GPL') arch=(any) depends=('texlive-core') @@ -20,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('2c900d7eaa4506b057e25be64b4ad24b' - 'd1d90a08bbea59c2f925a4b07c355828') +md5sums=('25d99fb9897513ceb2ae19f078ad750c' + 'c57e28ee1d2481b7e14685c70d8e6a51') build() { cd "$srcdir" diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index 771bf3607..e76444d08 100644 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps @@ -6,6 +6,7 @@ Map ArtNouvc.map Map BulletsADF.map Map Carrickc.map Map CountriesOfEurope.map +Map EBGaramond.map Map ESSTIX.map Map Eichenla.map Map Eileen.map @@ -16,6 +17,7 @@ Map GoudyIn.map Map Kinigcap.map Map Konanur.map Map Kramer.map +Map LibreBaskerville.map Map MnSymbol.map Map MorrisIn.map Map Nouveaud.map @@ -41,7 +43,6 @@ Map aurical.map Map belleek.map Map bera.map Map bguq.map -Map biolinum-type1.map Map boondox.map Map cabin.map Map calligra.map @@ -80,13 +81,14 @@ Map iwona.map Map kpfonts.map Map kurier.map Map lato.map -Map libertine-type1.map +Map libertine.map Map linearA.map Map mathabx.map Map mdbch.map Map mdput.map Map mdsymbol.map Map mdugm.map +Map newpx.map Map newtx.map Map ocrb.map Map opensans.map @@ -95,6 +97,7 @@ Map pbsi.map Map phaistos.map Map prodint.map Map pxtx.map +Map quattrocento.map Map recycle.map Map rsfso.map Map sansmathaccent.map diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 533a0aa6e..1cd8270e0 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 171569 2012-11-19 07:37:56Z remy $ +# $Id: PKGBUILD 183221 2013-04-18 23:52:31Z remy $ +# Maintainer: Firmicus # Maintainer: Rémy Oudompheng # Maintainer (Parabola): Michał Masłowski # Contributor (Parabola): André Silva pkgname=texlive-latexextra-libre _pkgname=texlive-latexextra -pkgver=2012.28272 +pkgver=2012.29701 _revnr=${pkgver#2012.} pkgrel=1 -pkgdesc="TeX Live - Large collection of add-on packages for LaTeX" +pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree packages" license=('GPL') arch=(any) depends=('texlive-core') @@ -25,7 +26,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('75db29b9e9bea30e9b6c1b77c4fca964' +md5sums=('1b67842cdc5debc80730fced7ce369ce' '9e4825f47dac663dd62c4bfa67899e84') build() { -- cgit v1.2.3-2-g168b From 18a4713bff419d5e3fa01a40ec324fb1e7f82dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 21 Apr 2013 12:41:45 -0300 Subject: texlive-bin-libre: improving description --- libre/texlive-bin-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 30dd997be..1f8199a48 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -7,7 +7,7 @@ pkgname=texlive-bin-libre pkgver=2012.0 pkgrel=10 -pkgdesc="TeX Live binaries, without biber (Parabola rebranded)" +pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') -- cgit v1.2.3-2-g168b From e8cda359f4e735150b702a3c24d9e65bdd71e762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 21 Apr 2013 12:44:11 -0300 Subject: texlive packages: improving description --- libre/texlive-core-libre/PKGBUILD | 2 +- libre/texlive-fontsextra-libre/PKGBUILD | 2 +- libre/texlive-latexextra-libre/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 92d5b0464..ca594501d 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=texlive-core pkgver=2012.29661 _revnr=${pkgver#2012.} pkgrel=1 -pkgdesc="TeX Live core distribution, without nonfree packages" +pkgdesc="TeX Live core distribution, without nonfree add-on packages" license=('GPL') arch=(any) depends=('texlive-bin-libre') diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index a20278d59..31ff6a3b4 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=texlive-fontsextra pkgver=2012.29646 _revnr=${pkgver#2012.} pkgrel=1 -pkgdesc="TeX Live - all sorts of extra fonts, without nonfree packages" +pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages" license=('GPL') arch=(any) depends=('texlive-core') diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 1cd8270e0..b327d2f61 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -9,7 +9,7 @@ _pkgname=texlive-latexextra pkgver=2012.29701 _revnr=${pkgver#2012.} pkgrel=1 -pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree packages" +pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages" license=('GPL') arch=(any) depends=('texlive-core') -- cgit v1.2.3-2-g168b From fec5e7ab94f162159da613c4c8a18dbc5c6e22dc Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Sun, 21 Apr 2013 23:53:52 -0300 Subject: Remove package parabola-archiso-git --- libre/parabola-archiso-git/PKGBUILD | 45 ------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 libre/parabola-archiso-git/PKGBUILD (limited to 'libre') diff --git a/libre/parabola-archiso-git/PKGBUILD b/libre/parabola-archiso-git/PKGBUILD deleted file mode 100644 index 0b07ddf8d..000000000 --- a/libre/parabola-archiso-git/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Sven-Hendrik Haase -# Maintainer (Parabola): André Silva -pkgname=parabola-archiso-git -pkgver=20120506 -pkgrel=1 -pkgdesc="Parabola GNU/Linux-libre livecd/liveusb generation scripts" -arch=('any') -url="https://parabolagnulinux.org" -license=('GPL') -depends=('libisoburn' 'squashfs-tools' 'rsync') -optdepends=('qemu: quickly test isos') -makedepends=('git') -provides=('archiso') -conflicts=('archiso') -source=() -md5sums=() - -_gitroot=git://parabolagnulinux.org/archiso.git -_gitname=archiso - -build() { - cd ${srcdir} - msg "Connecting to projects.parabolagnulinux.org GIT server..." - - if [ -d ${srcdir}/$_gitname ]; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - if [ -d ${srcdir}/$_gitname-build ]; then - rm -rf ${srcdir}/$_gitname-build - fi - - git clone ${srcdir}/$_gitname ${srcdir}/$_gitname-build || return 1 - cd ${srcdir}/$_gitname-build/$_gitname || return 1 - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b From 9b61d50becbeeba6c36f069d832c1cc9b64d883c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 22 Apr 2013 11:33:30 -0300 Subject: rp-pppoe-libre-3.11-3: updating revision * fix https://bugs.archlinux.org/task/34736 => install systemd service not 755 --- libre/rp-pppoe-libre/PKGBUILD | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'libre') diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index 2158c2892..2a45f0310 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $ +# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $ # Maintainer: Daniel Isenmann # Contributor: orelien # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ _pkgname=rp-pppoe pkgname=rp-pppoe-libre pkgver=3.11 -pkgrel=2 -pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)" +pkgrel=3 +pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') @@ -19,26 +19,23 @@ provides=("rp-pppoe=$pkgver") replaces=('rp-pppoe') conflicts=('rp-pppoe') install=rp-pppoe.install -source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} - adsl adsl.service kmode.patch $pkgname.patch) -md5sums=('13b5900c56bd602df6cc526e5e520722' - '8fc724aa146dba52ef7b3fbe5b8784c6' - 'adace1ad441aa88dcb3db52fb7f9c97f' - 'af234125f956f3a356ab0d0fcaa9e8a2' - 'd38a903a247d689ff0323d7b6caa1c6b' - '3c53d550ac408608abb0b6cd6b76b6c2') +source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} + adsl.service + kmode.patch + $pkgname.patch) -build() { +prepare() { cd "$srcdir/$_pkgname-$pkgver" ## Adding patch to remove unfree software recommendation (ServPoET) patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" - cd ./src - - ## Adding support kernel mode + cd "$srcdir/$_pkgname-$pkgver/src" patch -Np2 -i ../../kmode.patch +} +build() { + cd "$srcdir/$pkgname-$pkgver/src" ./configure --prefix=/usr --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } @@ -47,6 +44,11 @@ package() { cd "$srcdir/$_pkgname-$pkgver/src" make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" - install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" + #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" + install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" } +md5sums=('13b5900c56bd602df6cc526e5e520722' + 'SKIP' + 'af234125f956f3a356ab0d0fcaa9e8a2' + 'd38a903a247d689ff0323d7b6caa1c6b' + '3c53d550ac408608abb0b6cd6b76b6c2') -- cgit v1.2.3-2-g168b From 8351d69e64a40d68fa32cfeea227b6fcf7afe974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 22 Apr 2013 11:46:18 -0300 Subject: cgminer-libre-3.0.0-1: updating version * Remove cpu mining options - not supported anymore --- libre/cgminer-libre/PKGBUILD | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'libre') diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index cc3749800..dfc4da18e 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -7,8 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=2.11.4 -_build= +pkgver=3.0.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -19,7 +18,7 @@ makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2" +source=(http://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v3.0.0.tar.gz "${pkgname%-$_pkgflag}.conf.d" "${pkgname%-$_pkgflag}.service") backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") @@ -27,22 +26,22 @@ backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") [ "$CARCH" == "x86_64" ] && makedepends+=('yasm') build() { - cd "$srcdir" - cd ${pkgname%-$_pkgflag}-$pkgver${_build} + cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver" # Use in-tree jansson since it is not compatible with jansson 2.0 #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - - ./configure --prefix=/usr --enable-cpumining --enable-scrypt --disable-adl + + ./autogen.sh + ./configure --prefix=/usr --enable-scrypt --disable-adl make } package() { - cd "$srcdir"/${pkgname%-$_pkgflag}-$pkgver${_build} + cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver" make DESTDIR="$pkgdir" install @@ -52,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('535ca85b504bd408d1eeddf4962ed685' +md5sums=('7da3cc51b9ce0598dde955b034616267' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') -- cgit v1.2.3-2-g168b From 308bfb446305a96dffce945b6c4fb82b10d1b91b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 22 Apr 2013 10:51:49 -0400 Subject: mv libre/{,python2-}django-countries; fix typo I had a typo in my patch to correct a typo! Irony! --- libre/django-countries/PKGBUILD | 26 -------------------------- libre/python2-django-countries/PKGBUILD | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 26 deletions(-) delete mode 100644 libre/django-countries/PKGBUILD create mode 100644 libre/python2-django-countries/PKGBUILD (limited to 'libre') diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD deleted file mode 100644 index 24b667a67..000000000 --- a/libre/django-countries/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Luke Shumaker - -pkgname=django-countries -pkgver=1.5 -pkgdesc="Provides a country field for Django models" -license=('custom:MIT') -url="http://bitbucket.org/smileychris/django-countries/" - -pkgrel=1 -arch=(any) -depends=('django') -makedepends=('python2-distribute') -source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=(6c65fcc3aa7de065a54cdb619397626d) - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py - # fix python->python2, and a typo! - sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - ./setup.py install --root="$pkgdir/" --optimize=1 -} diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD new file mode 100644 index 000000000..a7bd85da1 --- /dev/null +++ b/libre/python2-django-countries/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Luke Shumaker + +_pkgname=django-countries +pkgname=python2-$_pkgname +pkgver=1.5 +pkgdesc="Provides a country field for Django models" +url="http://bitbucket.org/smileychris/$_pkgname/" +license=('custom:MIT') + +replaces=($_pkgname) +conflicts=($_pkgname) + +pkgrel=2 +arch=(any) +depends=('python2-django') +makedepends=('python2-distribute') +source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz) +md5sums=(6c65fcc3aa7de065a54cdb619397626d) + +build() { + cd "$srcdir/$_pkgname-$pkgver" + sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py + # fix help message: (python2, typo) + # "python regenenerate.py" -> "python2 regenerate.py" + sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + ./setup.py install --root="$pkgdir/" --optimize=1 +} -- cgit v1.2.3-2-g168b From 240aa9c7afbe2d2dc95c2d4c76b83376773d2a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 22 Apr 2013 11:59:45 -0300 Subject: rp-pppoe-libre: fixing a description on PKGBUILD --- libre/rp-pppoe-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index 2a45f0310..524c15a8e 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -27,7 +27,7 @@ source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.s prepare() { cd "$srcdir/$_pkgname-$pkgver" - ## Adding patch to remove unfree software recommendation (ServPoET) + ## Adding patch to remove nonfree software recommendation (ServPoET) patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" cd "$srcdir/$_pkgname-$pkgver/src" -- cgit v1.2.3-2-g168b From 9b4c40952911242ac8181013accf8ec4cd58f800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 22 Apr 2013 12:09:27 -0300 Subject: rp-pppoe-libre: fixing building path --- libre/rp-pppoe-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index 524c15a8e..e8a981a3d 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -35,7 +35,7 @@ prepare() { } build() { - cd "$srcdir/$pkgname-$pkgver/src" + cd "$srcdir/$_pkgname-$pkgver/src" ./configure --prefix=/usr --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } -- cgit v1.2.3-2-g168b From 4e46a07ffcebe8aeee045615623bc141df8f6466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 22 Apr 2013 12:46:29 -0300 Subject: cgminer-libre: updating md5sum --- libre/cgminer-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index dfc4da18e..9d771b952 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('7da3cc51b9ce0598dde955b034616267' +md5sums=('63551fdb16086d57bfa4d39cd40d74cd' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') -- cgit v1.2.3-2-g168b