Date: Saturday, October 22, 2011 @ 11:10:37 Author: andrea Revision: 141050
upgpkg: kino 1.3.4-3 Rebuild old package; fix build Added: kino/trunk/videodev-header.patch Modified: kino/trunk/PKGBUILD kino/trunk/kino.install -----------------------+ PKGBUILD | 22 +++++++++++++++------- kino.install | 3 +-- videodev-header.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-22 14:30:55 UTC (rev 141049) +++ PKGBUILD 2011-10-22 15:10:37 UTC (rev 141050) @@ -4,23 +4,31 @@ pkgname=kino pkgver=1.3.4 -pkgrel=2 -pkgdesc="A non-linear DV editor." +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') +makedepends=('intltool' 'v4l-utils') options=('!libtool') install=kino.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('52f8ce690e45a089e3edc6c7af61a05c') +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 || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - chown root:root -R $pkgdir/usr/share/kino/help } Modified: kino.install =================================================================== --- kino.install 2011-10-22 14:30:55 UTC (rev 141049) +++ kino.install 2011-10-22 15:10:37 UTC (rev 141050) @@ -1,14 +1,13 @@ 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 } Added: videodev-header.patch =================================================================== --- videodev-header.patch (rev 0) +++ videodev-header.patch 2011-10-22 15:10:37 UTC (rev 141050) @@ -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" +