Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c2b8f97a7a9d7221b7c6b391669179020e0d60c7
commit c2b8f97a7a9d7221b7c6b391669179020e0d60c7
Author: Krisztian VASAS <i...@frugalware.org>
Date: Wed Jun 2 20:14:25 2010 +0200
tvtime-1.0.2-3-i686
- relbump due libpng change
- added some compile fixes
- updated depends: added version to libpng
diff --git a/source/xapps-extra/tvtime/FrugalBuild
b/source/xapps-extra/tvtime/FrugalBuild
index 017daa3..15a063c 100644
--- a/source/xapps-extra/tvtime/FrugalBuild
+++ b/source/xapps-extra/tvtime/FrugalBuild
@@ -4,21 +4,28 @@
pkgname=tvtime
pkgver=1.0.2
-pkgrel=2
+pkgrel=3
pkgdesc="A program for viewing tv on the computer"
-depends=('libxv' 'libxtst' 'libsm' 'libxinerama' 'libstdc++' 'libxxf86vm'
'freetype2' 'libxml2' 'libpng' 'libxt')
+depends=('libxv' 'libxtst' 'libsm' 'libxinerama' 'libstdc++' 'libxxf86vm'
'freetype2' 'libxml2' 'libpng>=1.4.2' 'libxt')
makedepends=('inputproto')
groups=('xapps-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
url="http://tvtime.sourceforge.net/";
-sha1sums=('ea609876084b2d627a84a1f77bf81cc2175ee58e')
+source=(${sour...@]} 'tvtime-remove_not_needed_include.patch' \
+ 'tvtime-fix_conflicting_types.patch' \
+ 'tvtime-fix_dscaler_compile_error.patch')
+sha1sums=('ea609876084b2d627a84a1f77bf81cc2175ee58e' \
+ '6927a1f38051e1f827ecaf4c47692acea60a61a0' \
+ '7ddb180a037b3da1fcb34cecf9adbc70e4710b6b' \
+ '354718a6e6cd212f30e925e0da71a8a3a6db97e3')
build()
{
- Fconf
+ Fpatchall
+ Fconf --without-sdl --without-directfb
find . -name Makefile|xargs sed -i "s/^\(CFLAGS =\) .*/\1 $CFLAGS/"
- make || return 1
+ make || Fdie
Fmakeinstall
}
diff --git a/source/xapps-extra/tvtime/tvtime-fix_conflicting_types.patch
b/source/xapps-extra/tvtime/tvtime-fix_conflicting_types.patch
new file mode 100644
index 0000000..287717a
--- /dev/null
+++ b/source/xapps-extra/tvtime/tvtime-fix_conflicting_types.patch
@@ -0,0 +1,23 @@
+--- tvtime-1.0.2.orig/src/xmltv.c
++++ tvtime-1.0.2/src/xmltv.c
+@@ -118,9 +118,9 @@
+ typedef struct {
+ const char *code;
+ const char *name;
+-} locale_t;
++} tvtime_locale_t;
+
+-static locale_t locale_table[] = {
++static tvtime_locale_t locale_table[] = {
+ {"AA", "Afar"}, {"AB", "Abkhazian"}, {"AF", "Afrikaans"},
+ {"AM", "Amharic"}, {"AR", "Arabic"}, {"AS", "Assamese"},
+ {"AY", "Aymara"}, {"AZ", "Azerbaijani"}, {"BA", "Bashkir"},
+@@ -168,7 +168,7 @@
+ {"XH", "Xhosa"}, {"YO", "Yoruba"}, {"ZH", "Chinese"},
+ {"ZU", "Zulu"} };
+
+-const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
++const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t );
+
+ /**
+ * Timezone parsing code based loosely on the algorithm in
diff --git a/source/xapps-extra/tvtime/tvtime-fix_dscaler_compile_error.patch
b/source/xapps-extra/tvtime/tvtime-fix_dscaler_compile_error.patch
new file mode 100644
index 0000000..b22a176
--- /dev/null
+++ b/source/xapps-extra/tvtime/tvtime-fix_dscaler_compile_error.patch
@@ -0,0 +1,57 @@
+diff -Naur tvtime-1.0.2.orig/plugins/greedyh.asm
tvtime-1.0.2/plugins/greedyh.asm
+--- tvtime-1.0.2.orig/plugins/greedyh.asm 2005-08-14 18:16:43.000000000
+0200
++++ tvtime-1.0.2/plugins/greedyh.asm 2010-06-02 20:07:44.000000000 +0200
+@@ -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.2.orig/plugins/tomsmocomp/TomsMoCompAll2.inc
tvtime-1.0.2/plugins/tomsmocomp/TomsMoCompAll2.inc
+--- tvtime-1.0.2.orig/plugins/tomsmocomp/TomsMoCompAll2.inc 2004-10-20
17:31:05.000000000 +0200
++++ tvtime-1.0.2/plugins/tomsmocomp/TomsMoCompAll2.inc 2010-06-02
20:08:16.000000000 +0200
+@@ -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.2.orig/plugins/tomsmocomp.cpp
tvtime-1.0.2/plugins/tomsmocomp.cpp
+--- tvtime-1.0.2.orig/plugins/tomsmocomp.cpp 2004-10-20 19:38:04.000000000
+0200
++++ tvtime-1.0.2/plugins/tomsmocomp.cpp 2010-06-02 20:08:26.000000000
+0200
+@@ -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
diff --git a/source/xapps-extra/tvtime/tvtime-remove_not_needed_include.patch
b/source/xapps-extra/tvtime/tvtime-remove_not_needed_include.patch
new file mode 100644
index 0000000..277f70d
--- /dev/null
+++ b/source/xapps-extra/tvtime/tvtime-remove_not_needed_include.patch
@@ -0,0 +1,11 @@
+diff -Naur tvtime-1.0.2.orig//src/videodev2.h tvtime-1.0.2/src/videodev2.h
+--- tvtime-1.0.2.orig//src/videodev2.h 2005-01-17 03:36:40.000000000 +0100
++++ tvtime-1.0.2/src/videodev2.h 2010-06-02 19:44:08.000000000 +0200
+@@ -16,7 +16,6 @@
+ #ifdef __KERNEL__
+ #include <linux/time.h> /* need struct timeval */
+ #endif
+-#include <linux/compiler.h> /* need __user */
+
+ /* for kernel versions 2.4.26 and below: */
+ #ifndef __user
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
