Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-16 19:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

multimedia/tvtime: Updated for version 1.0.7.

Browse source 
Fixes build with libpng-1.6.

Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
David Spencer 2015-07-24 13:23:47 +01:00 committed by Willy Sudiarto Raharjo
parent 4af65c01a9
commit 38fb93d505
9 changed files with 7 additions and 1431 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
multimedia/tvtime/patches/dqbuf-fix.patch
View file

@ -1,11 +0,0 @@
diff -Nur tvtime-1.0.2-old/src/videoinput.c tvtime-1.0.2/src/videoinput.c
--- tvtime-1.0.2-old/src/videoinput.c 2007-07-08 14:29:13.539465861 +0300
+++ tvtime-1.0.2/src/videoinput.c 2007-07-08 14:42:32.776963292 +0300
@@ -377,6 +377,7 @@
wait_for_frame_v4l2( vidin );
cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type;
+ cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory;
if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) {
/* some drivers return EIO when there is no signal */
if( errno != EIO ) {

24
multimedia/tvtime/patches/glibc-2.10.patch
View file

@ -1,24 +0,0 @@
diff -Naur tvtime-1.0.2.org/src/xmltv.c tvtime-1.0.2/src/xmltv.c
--- tvtime-1.0.2.org/src/xmltv.c 2009-07-02 21:48:49.426191088 +0200
+++ tvtime-1.0.2/src/xmltv.c 2009-07-02 21:50:20.842066085 +0200
@@ -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

16
multimedia/tvtime/patches/kernel-headers.patch
View file

@ -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"

57
multimedia/tvtime/patches/tvtime-1.0.2-gcc41.patch
View file

@ -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

1289
multimedia/tvtime/patches/tvtime-1.0.2-tr_po.patch
View file

File diff suppressed because it is too large Load diff

11
multimedia/tvtime/patches/tvtime-pic.patch
View file

@ -1,11 +0,0 @@
--- tvtime/src/cpu_accel.c
+++ tvtime/src/cpu_accel.c
@@ -35,7 +35,7 @@
int AMD;
uint32_t caps;
-#ifndef PIC
+#if !defined(PIC) && !defined(__PIC__)
#define cpuid(op,eax,ebx,ecx,edx) \
__asm__ ("cpuid" \
: "=a" (eax), \

11
multimedia/tvtime/patches/videodev2.patch
View file

@ -1,11 +0,0 @@
diff -Nur tvtime-1.0.2-old/src/videodev2.h tvtime-1.0.2/src/videodev2.h
--- tvtime-1.0.2-old/src/videodev2.h 2007-07-08 14:29:13.684443820 +0300
+++ tvtime-1.0.2/src/videodev2.h 2007-07-08 14:38:12.531526612 +0300
@@ -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

13
multimedia/tvtime/tvtime.SlackBuild
View file

@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=tvtime
VERSION=${VERSION:-1.0.2}
BUILD=${BUILD:-4}
VERSION=${VERSION:-1.0.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -71,13 +71,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Apply some bugfix patches from Pardus and Gentoo
# http://paketler.pardus.org.tr/2007/source/tvtime.html
# http://bugs.gentoo.org/attachment.cgi?id=196423
for foo in $CWD/patches/* ; do
patch -p1 < $foo ;
done
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@ -85,6 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-x \
--enable-static=no \
--build=$ARCH-slackware-linux

6
multimedia/tvtime/tvtime.info
View file

@ -1,8 +1,8 @@
PRGNAM="tvtime"
VERSION="1.0.2"
VERSION="1.0.7"
HOMEPAGE="http://tvtime.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/tvtime/tvtime-1.0.2.tar.gz"
MD5SUM="4b3d03afe61be239b08b5e522cd8afed"
DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.7.tar.gz"
MD5SUM="d3cea3053ce8ff0d555da82fad138b44"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""