[arch-commits] Commit in tvtime/repos (4 files)

Eric Bélanger eric at archlinux.org
Tue Feb 24 06:12:19 UTC 2009 

    Date: Tuesday, February 24, 2009 @ 01:12:19
  Author: eric
Revision: 27647

fixed svn conflict

Added:
  tvtime/repos/extra-x86_64/tvtime-1.0.2+linux-headers-2.6.18.patch
    (from rev 27646, tvtime/trunk/tvtime-1.0.2+linux-headers-2.6.18.patch)
  tvtime/repos/extra-x86_64/tvtime-1.0.2-gcc41.patch
    (from rev 27646, tvtime/trunk/tvtime-1.0.2-gcc41.patch)
Modified:
  tvtime/repos/extra-x86_64/	(properties)
  tvtime/repos/extra-x86_64/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   28 ++++++++------
 tvtime-1.0.2+linux-headers-2.6.18.patch |   15 +++++++
 tvtime-1.0.2-gcc41.patch                |   57 ++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 11 deletions(-)


Property changes on: tvtime/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /tvtime/trunk:1
   + /tvtime/trunk:1-27646

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-24 06:09:04 UTC (rev 27646)
+++ extra-x86_64/PKGBUILD	2009-02-24 06:12:19 UTC (rev 27647)
@@ -2,19 +2,25 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=tvtime
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="tvtime is a high quality television application for use with video capture cards."
-arch=(i686 x86_64)
-depends=('libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv' 'libsm' 'libxxf86vm')
-source=(http://dl.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz)
-md5sums=('e7c7951fa1aabd15254cfbc17fe8a976')
+pkgver=1.0.2
+pkgrel=1
+pkgdesc="A high quality television application for use with video capture cards"
+arch=('i686' 'x86_64')
 url='http://tvtime.sourceforge.net/'
+license=('GPL' 'LGPL')
+depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv' 'libsm' 'libxxf86vm')
+makedepends=('libxt')
+source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz \
+        tvtime-1.0.2+linux-headers-2.6.18.patch tvtime-1.0.2-gcc41.patch)
+md5sums=('4b3d03afe61be239b08b5e522cd8afed' '29b0aefd80fddae68613854b627e044a'\
+         'c782789825dfa664e1f6fcc96ac7246c')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch || return 1
+  patch -p1 < ../tvtime-1.0.2-gcc41.patch || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  cp docs/html/default.tvtime.xml $startdir/pkg/usr/share/tvtime
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml || return 1
 }

Copied: tvtime/repos/extra-x86_64/tvtime-1.0.2+linux-headers-2.6.18.patch (from rev 27646, tvtime/trunk/tvtime-1.0.2+linux-headers-2.6.18.patch)
===================================================================
--- extra-x86_64/tvtime-1.0.2+linux-headers-2.6.18.patch	                        (rev 0)
+++ extra-x86_64/tvtime-1.0.2+linux-headers-2.6.18.patch	2009-02-24 06:12:19 UTC (rev 27647)
@@ -0,0 +1,15 @@
+Index: tvtime-1.0.2/src/videoinput.c
+===================================================================
+--- tvtime-1.0.2.orig/src/videoinput.c
++++ tvtime-1.0.2/src/videoinput.c
+@@ -35,8 +35,8 @@
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+-#include "videodev.h"
+-#include "videodev2.h"
++#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ #include "videoinput.h"
+ #include "mixer.h"
+ 

Copied: tvtime/repos/extra-x86_64/tvtime-1.0.2-gcc41.patch (from rev 27646, tvtime/trunk/tvtime-1.0.2-gcc41.patch)
===================================================================
--- extra-x86_64/tvtime-1.0.2-gcc41.patch	                        (rev 0)
+++ extra-x86_64/tvtime-1.0.2-gcc41.patch	2009-02-24 06:12:19 UTC (rev 27647)
@@ -0,0 +1,57 @@
+diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm
+--- tvtime-1.0.1/plugins/greedyh.asm	2005-08-14 18:16:43.000000000 +0200
++++ tvtime-1.0.1-gcc41/plugins/greedyh.asm	2005-11-28 17:53:09.210774544 +0100
+@@ -18,7 +18,7 @@
+ 
+ #include "x86-64_macros.inc"
+ 
+-void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
++void FUNCT_NAME(TDeinterlaceInfo* pInfo)
+ {
+     int64_t i;
+     bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
+diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc
+--- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc	2004-10-20 17:31:05.000000000 +0200
++++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc	2005-11-28 17:53:33.251119856 +0100
+@@ -5,9 +5,9 @@
+ #endif
+ 
+ #ifdef USE_STRANGE_BOB
+-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
++#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
+ #else
+-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
++#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
+ #endif
+ 
+ int SEARCH_EFFORT_FUNC(0)		// we don't try at all ;-)
+diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp
+--- tvtime-1.0.1/plugins/tomsmocomp.cpp	2004-10-20 19:38:04.000000000 +0200
++++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp	2005-11-28 17:52:53.862107896 +0100
+@@ -31,7 +31,7 @@
+ 
+ #define IS_MMX
+ #define SSE_TYPE MMX
+-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
++#define FUNCT_NAME filterDScaler_MMX
+ #include "tomsmocomp/TomsMoCompAll.inc"
+ #undef  IS_MMX
+ #undef  SSE_TYPE
+@@ -39,7 +39,7 @@
+ 
+ #define IS_3DNOW
+ #define SSE_TYPE 3DNOW
+-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
++#define FUNCT_NAME filterDScaler_3DNOW
+ #include "tomsmocomp/TomsMoCompAll.inc"
+ #undef  IS_3DNOW
+ #undef  SSE_TYPE
+@@ -47,7 +47,7 @@
+ 
+ #define IS_SSE
+ #define SSE_TYPE SSE
+-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
++#define FUNCT_NAME filterDScaler_SSE
+ #include "tomsmocomp/TomsMoCompAll.inc"
+ #undef  IS_SSE
+ #undef  SSE_TYPE

More information about the arch-commits mailing list