hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

multimedia/tvtime: Updated for version 1.0.2

This commit is contained in:
Kyle Guinn 2010-05-11 19:45:45 +02:00 committed by Robby Workman
parent 38cadd7ce9
commit 34a25ea70f
11 changed files with 1458 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
multimedia/tvtime/README
View File

@ -4,4 +4,3 @@ displays it on a computer monitor or projector.
Supported cards and troubleshooting information can be found at the project's
homepage.

16
multimedia/tvtime/doinst.sh
View File

@ -1,9 +1,19 @@
config() {
NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)"
# If there's no config file by that name, mv it over:
if [ ! -r $OLD ]; then
mv $NEW $OLD
elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
# toss the redundant copy
rm $NEW
fi
# Otherwise, we leave the .new copy for the admin to consider...
}
if [ -x usr/bin/update-desktop-database ]; then
usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
fi
if [ -x usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -f -t usr/share/icons/hicolor &> /dev/null
fi
config etc/tvtime/tvtime.xml.new

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

@ -0,0 +1,11 @@
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 ) {

15
multimedia/tvtime/patches/kernel-headers.patch Normal file
View File

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

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

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

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

File diff suppressed because it is too large Load Diff

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

@ -0,0 +1,11 @@
--- 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 Normal file
View File

@ -0,0 +1,11 @@
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

10
multimedia/tvtime/slack-desc
View File

@ -1,4 +1,12 @@
tvtime: tvtime
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
tvtime: tvtime (high quality television application)
tvtime:
tvtime: tvtime is a high quality television application for use with
tvtime: video capture cards on Linux systems. tvtime processes the

66
multimedia/tvtime/tvtime.SlackBuild
View File

@ -1,38 +1,43 @@
#!/bin/sh
# Slackware build script for tvtime
# Written by Kyle Guinn
# Written by Kyle Guinn <elyk03@gmail.com>
# Modified by the SlackBuilds.org project
VERSION=1.0.1
PRGNAM=tvtime
VERSION=1.0.2
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CWD=`pwd`
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-tvtime
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
# The INSTALL file recommends avoiding the use of the "-march" flag.
# If you need it, change the appropriate lines below.
if [ "$ARCH" = "i486" ]; then
#SLKCFLAGS="-march=i486 -mtune=i686"
SLKCFLAGS=""
elif [ "$ARCH" = "i686" ]; then
#SLKCFLAGS="-march=i686 -mtune=i686"
SLKCFLAGS=""
fi
#if [ "$ARCH" = "i486" ]; then
#SLKCFLAGS="-O2 -march=i486 -mtune=i686"
#elif [ "$ARCH" = "i686" ]; then
#SLKCFLAGS="-O2 -march=i686 -mtune=i686"
#fi
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP || exit 1
rm -rf tvtime-$VERSION
tar -xzvf $CWD/tvtime-$VERSION.tar.gz || exit 1
cd tvtime-$VERSION || exit 1
cd $TMP
rm -rf $PRGNAM-$VERSION
tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
# Apply some bugfix patches from Pardus
# http://paketler.pardus.org.tr/2007/source/tvtime.html
for foo in $CWD/patches/* ; do
patch -p1 < $foo ;
done
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@ -40,27 +45,32 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--with-x \
|| exit 1
--enable-static=no
make || exit 1
make install-strip DESTDIR=$PKG || exit 1
make
make install DESTDIR=$PKG
# Fix icon path in .desktop file so that it will show in KDE
sed -i 's%Icon=tvtime.png%Icon=/usr/share/pixmaps/tvtime.png%g' \
$PKG/usr/share/applications/net-tvtime.desktop || exit 1
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
)
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
)
mkdir -p $PKG/usr/doc/tvtime-$VERSION
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README docs/html \
$PKG/usr/doc/tvtime-$VERSION
cat $CWD/tvtime.SlackBuild > $PKG/usr/doc/tvtime-$VERSION/tvtime.SlackBuild
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
# Let's not clobber the config file
mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/tvtime-$VERSION-$ARCH-$BUILD$TAG.tgz
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz

8
multimedia/tvtime/tvtime.info
View File

@ -1,8 +1,8 @@
PRGNAM="tvtime"
VERSION="1.0.1"
VERSION="1.0.2"
HOMEPAGE="http://tvtime.sourceforge.net/"
DOWNLOAD="http://dl.sourceforge.net/tvtime/tvtime-1.0.1.tar.gz"
MD5SUM="e7c7951fa1aabd15254cfbc17fe8a976"
DOWNLOAD="http://downloads.sourceforge.net/tvtime/tvtime-1.0.2.tar.gz"
MD5SUM="4b3d03afe61be239b08b5e522cd8afed"
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"
APPROVED="robw810"
APPROVED="rworkman"