Date: Saturday, October 22, 2011 @ 11:12:07 Author: andrea Revision: 141051
archrelease: copy trunk to extra-i686, extra-x86_64 Added: kino/repos/extra-i686/PKGBUILD (from rev 141050, kino/trunk/PKGBUILD) kino/repos/extra-i686/kino.install (from rev 141050, kino/trunk/kino.install) kino/repos/extra-i686/videodev-header.patch (from rev 141050, kino/trunk/videodev-header.patch) kino/repos/extra-x86_64/PKGBUILD (from rev 141050, kino/trunk/PKGBUILD) kino/repos/extra-x86_64/kino.install (from rev 141050, kino/trunk/kino.install) kino/repos/extra-x86_64/videodev-header.patch (from rev 141050, kino/trunk/videodev-header.patch) Deleted: kino/repos/extra-i686/PKGBUILD kino/repos/extra-i686/kino.install kino/repos/extra-x86_64/PKGBUILD kino/repos/extra-x86_64/kino.install ------------------------------------+ extra-i686/PKGBUILD | 60 +++++++++++++++++++---------------- extra-i686/kino.install | 27 +++++++-------- extra-i686/videodev-header.patch | 26 +++++++++++++++ extra-x86_64/PKGBUILD | 60 +++++++++++++++++++---------------- extra-x86_64/kino.install | 27 +++++++-------- extra-x86_64/videodev-header.patch | 26 +++++++++++++++ 6 files changed, 146 insertions(+), 80 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-10-22 15:10:37 UTC (rev 141050) +++ extra-i686/PKGBUILD 2011-10-22 15:12:07 UTC (rev 141051) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Robert Emil Berge <rob...@rebi.no> - -pkgname=kino -pkgver=1.3.4 -pkgrel=2 -pkgdesc="A non-linear DV editor." -arch=('i686' 'x86_64') -url="http://www.kinodv.org/" -license=('GPL') -depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm') -makedepends=('intltool') -options=('!libtool') -install=kino.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('52f8ce690e45a089e3edc6c7af61a05c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-udev-rules-dir=/lib/udev/rules.d - make || return 1 - make DESTDIR="${pkgdir}" install - chown root:root -R $pkgdir/usr/share/kino/help -} Copied: kino/repos/extra-i686/PKGBUILD (from rev 141050, kino/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-10-22 15:12:07 UTC (rev 141051) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Robert Emil Berge <rob...@rebi.no> + +pkgname=kino +pkgver=1.3.4 +pkgrel=3 +pkgdesc="A non-linear DV editor" +arch=('i686' 'x86_64') +url="http://www.kinodv.org/" +license=('GPL') +depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm') +makedepends=('intltool' 'v4l-utils') +options=('!libtool') +install=kino.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'videodev-header.patch') +md5sums=('52f8ce690e45a089e3edc6c7af61a05c' + '940404c0eec3c9d954c289ceb52d15a6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i "${srcdir}"/videodev-header.patch + + ./configure --prefix=/usr \ + --with-udev-rules-dir=/lib/udev/rules.d + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/kino.install =================================================================== --- extra-i686/kino.install 2011-10-22 15:10:37 UTC (rev 141050) +++ extra-i686/kino.install 2011-10-22 15:12:07 UTC (rev 141051) @@ -1,14 +0,0 @@ -post_install() { - echo "update desktop mime database..." - update-mime-database usr/share/mime 1> /dev/null - update-desktop-database -q -} -post_upgrade() { - post_install $1 -} - -post_remove() { - echo "update desktop mime database..." - update-mime-database usr/share/mime 1> /dev/null - update-desktop-database -q -} Copied: kino/repos/extra-i686/kino.install (from rev 141050, kino/trunk/kino.install) =================================================================== --- extra-i686/kino.install (rev 0) +++ extra-i686/kino.install 2011-10-22 15:12:07 UTC (rev 141051) @@ -0,0 +1,13 @@ +post_install() { + update-mime-database usr/share/mime 1> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-mime-database usr/share/mime 1> /dev/null + update-desktop-database -q +} Copied: kino/repos/extra-i686/videodev-header.patch (from rev 141050, kino/trunk/videodev-header.patch) =================================================================== --- extra-i686/videodev-header.patch (rev 0) +++ extra-i686/videodev-header.patch 2011-10-22 15:12:07 UTC (rev 141051) @@ -0,0 +1,26 @@ +Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c +=================================================================== +--- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200 ++++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200 +@@ -26,7 +26,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +Index: kino-1.3.4/src/v4l.h +=================================================================== +--- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200 ++++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "displayer.h" + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-10-22 15:10:37 UTC (rev 141050) +++ extra-x86_64/PKGBUILD 2011-10-22 15:12:07 UTC (rev 141051) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Robert Emil Berge <rob...@rebi.no> - -pkgname=kino -pkgver=1.3.4 -pkgrel=2 -pkgdesc="A non-linear DV editor." -arch=('i686' 'x86_64') -url="http://www.kinodv.org/" -license=('GPL') -depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm') -makedepends=('intltool') -options=('!libtool') -install=kino.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('52f8ce690e45a089e3edc6c7af61a05c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-udev-rules-dir=/lib/udev/rules.d - make || return 1 - make DESTDIR="${pkgdir}" install - chown root:root -R $pkgdir/usr/share/kino/help -} Copied: kino/repos/extra-x86_64/PKGBUILD (from rev 141050, kino/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-10-22 15:12:07 UTC (rev 141051) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Robert Emil Berge <rob...@rebi.no> + +pkgname=kino +pkgver=1.3.4 +pkgrel=3 +pkgdesc="A non-linear DV editor" +arch=('i686' 'x86_64') +url="http://www.kinodv.org/" +license=('GPL') +depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm') +makedepends=('intltool' 'v4l-utils') +options=('!libtool') +install=kino.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'videodev-header.patch') +md5sums=('52f8ce690e45a089e3edc6c7af61a05c' + '940404c0eec3c9d954c289ceb52d15a6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i "${srcdir}"/videodev-header.patch + + ./configure --prefix=/usr \ + --with-udev-rules-dir=/lib/udev/rules.d + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/kino.install =================================================================== --- extra-x86_64/kino.install 2011-10-22 15:10:37 UTC (rev 141050) +++ extra-x86_64/kino.install 2011-10-22 15:12:07 UTC (rev 141051) @@ -1,14 +0,0 @@ -post_install() { - echo "update desktop mime database..." - update-mime-database usr/share/mime 1> /dev/null - update-desktop-database -q -} -post_upgrade() { - post_install $1 -} - -post_remove() { - echo "update desktop mime database..." - update-mime-database usr/share/mime 1> /dev/null - update-desktop-database -q -} Copied: kino/repos/extra-x86_64/kino.install (from rev 141050, kino/trunk/kino.install) =================================================================== --- extra-x86_64/kino.install (rev 0) +++ extra-x86_64/kino.install 2011-10-22 15:12:07 UTC (rev 141051) @@ -0,0 +1,13 @@ +post_install() { + update-mime-database usr/share/mime 1> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-mime-database usr/share/mime 1> /dev/null + update-desktop-database -q +} Copied: kino/repos/extra-x86_64/videodev-header.patch (from rev 141050, kino/trunk/videodev-header.patch) =================================================================== --- extra-x86_64/videodev-header.patch (rev 0) +++ extra-x86_64/videodev-header.patch 2011-10-22 15:12:07 UTC (rev 141051) @@ -0,0 +1,26 @@ +Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c +=================================================================== +--- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200 ++++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200 +@@ -26,7 +26,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +Index: kino-1.3.4/src/v4l.h +=================================================================== +--- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200 ++++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "displayer.h" +