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

[Sergej Pupykin]

    Date: Monday, June 22, 2015 @ 11:57:58
  Author: spupykin
Revision: 135695

upgpkg: tvtime 1.0.7-1

upd

Modified:
  tvtime/trunk/PKGBUILD
Deleted:
  tvtime/trunk/tvtime-1.0.2+linux-headers-2.6.18.patch
  tvtime/trunk/tvtime-1.0.2-gcc41.patch
  tvtime/trunk/tvtime-1.0.2-locale_t.patch

-----------------------------------------+
 PKGBUILD                                |   38 +++++++-------------
 tvtime-1.0.2+linux-headers-2.6.18.patch |   16 --------
 tvtime-1.0.2-gcc41.patch                |   57 ------------------------------
 3 files changed, 15 insertions(+), 96 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-22 09:57:55 UTC (rev 135694)
+++ PKGBUILD	2015-06-22 09:57:58 UTC (rev 135695)
@@ -3,39 +3,31 @@
 # Maintainer:thefatprecious <marty at loomar.com>
 
 pkgname=tvtime
-pkgver=1.0.2
-pkgrel=5
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="A high quality television application for use with video capture cards"
 arch=('i686' 'x86_64')
-url='http://tvtime.sourceforge.net/'
+url='http://linuxtv.org/'
 license=('GPL' 'LGPL')
 depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv'
-	 'libsm' 'libxxf86vm')
-makedepends=('libxt' 'v4l-utils')
-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
-	tvtime-1.0.2-locale_t.patch)
-md5sums=('4b3d03afe61be239b08b5e522cd8afed'
-         'e956821745686b5b3a784f7471996ade'
-         'c782789825dfa664e1f6fcc96ac7246c'
-         '1069dc5b47bba8456cbf48e34cb5c0b6')
+	 'libsm' 'libxxf86vm' 'alsa-lib')
+makedepends=('libxt' 'v4l-utils' 'git')
+source=("git://linuxtv.org/tvtime.git#tag=v1.0.7")
+md5sums=('SKIP')
 
+prepare() {
+  cd $srcdir/$pkgname
+  echo "StartupWMClass=tvtime" >>docs/tvtime.desktop
+}
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch
-  patch -p1 < ../tvtime-1.0.2-gcc41.patch
-  patch -p1 < ../tvtime-1.0.2-locale_t.patch
-  sed -i '1,1i#include <zlib.h>' src/pngoutput.c
-  echo "StartupWMClass=tvtime" >>docs/net-tvtime.desktop
-
-  [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc
+  cd $srcdir/$pkgname
+  ./autogen.sh --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname
   make DESTDIR=$pkgdir install
   install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml
 }

Deleted: tvtime-1.0.2+linux-headers-2.6.18.patch
===================================================================
--- tvtime-1.0.2+linux-headers-2.6.18.patch	2015-06-22 09:57:55 UTC (rev 135694)
+++ tvtime-1.0.2+linux-headers-2.6.18.patch	2015-06-22 09:57:58 UTC (rev 135695)
@@ -1,16 +0,0 @@
-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,9 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
--#include "videodev.h"
--#include "videodev2.h"
-+#include <libv4l1-videodev.h>
-+#include <linux/videodev2.h>
-+#define BASE_VIDIOCPRIVATE      192             /* 192-255 are private */
- #include "videoinput.h"
- #include "mixer.h"
- 

Deleted: tvtime-1.0.2-gcc41.patch
===================================================================
--- tvtime-1.0.2-gcc41.patch	2015-06-22 09:57:55 UTC (rev 135694)
+++ tvtime-1.0.2-gcc41.patch	2015-06-22 09:57:58 UTC (rev 135695)
@@ -1,57 +0,0 @@
-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

Deleted: tvtime-1.0.2-locale_t.patch
===================================================================
(Binary files differ)