[packages/tvtime] - new Source0 URL, updated to 1.0.10 - updated autodetect_textured_overlay patch - removed obsolete
qboosh
qboosh at pld-linux.org
Mon Jul 4 19:47:25 CEST 2016
commit 1a494fb5c4495dd3050d949df4b872a7166782ca
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jul 4 19:47:34 2016 +0200
- new Source0 URL, updated to 1.0.10
- updated autodetect_textured_overlay patch
- removed obsolete desktop,gcc,def_user,libpng-1.5,format patches
- added opt patch (prefer PLD optflags)
tvtime-autodetect_textured_overlay.patch | 67 +++++++++++++-------------
tvtime-def_user.patch | 10 ----
tvtime-desktop.patch | 8 ----
tvtime-format.patch | 11 -----
tvtime-gcc.patch | 80 --------------------------------
tvtime-libpng-1.5.patch | 14 ------
tvtime.spec | 71 ++++++++++++++++------------
7 files changed, 72 insertions(+), 189 deletions(-)
---
diff --git a/tvtime.spec b/tvtime.spec
index d8cadf7..0f51779 100644
--- a/tvtime.spec
+++ b/tvtime.spec
@@ -1,32 +1,33 @@
Summary: A high quality TV viewer
Summary(pl.UTF-8): Program do oglądania TV w wysokiej jakości
Name: tvtime
-Version: 1.0.2
-Release: 11
-License: GPL
+Version: 1.0.10
+Release: 1
+License: GPL v2+
Group: Applications/Multimedia
-Source0: http://downloads.sourceforge.net/tvtime/%{name}-%{version}.tar.gz
-# Source0-md5: 4b3d03afe61be239b08b5e522cd8afed
-Patch0: %{name}-desktop.patch
-Patch1: %{name}-gcc.patch
-Patch2: %{name}-def_user.patch
-Patch3: %{name}-autodetect_textured_overlay.patch
-Patch4: %{name}-libpng-1.5.patch
-Patch5: %{name}-format.patch
+Source0: https://linuxtv.org/downloads/tvtime/%{name}-%{version}.tar.gz
+# Source0-md5: 97a09d1723c073eb2b8bea48a148a994
+Patch0: %{name}-opt.patch
+Patch1: %{name}-autodetect_textured_overlay.patch
URL: http://tvtime.sourceforge.net/
+BuildRequires: alsa-lib-devel >= 1.0.9
BuildRequires: automake
-BuildRequires: freetype-devel
+BuildRequires: freetype-devel >= 2
+BuildRequires: gcc >= 5:3.2
BuildRequires: gettext-tools
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2.0
BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXScrnSaver-devel
+BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXt-devel
-BuildRequires: xorg-lib-libXtst-devel
BuildRequires: xorg-lib-libXv-devel
BuildRequires: xorg-lib-libXxf86vm-devel
BuildRequires: zlib-devel
+Requires: alsa-lib >= 1.0.9
+# ?
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,17 +51,12 @@ wysokiej jakości obrazu, co czyni go idealnym dla wideofili.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
cp -f /usr/share/automake/config.sub .
%configure \
- --disable-dependency-tracking
-%{__make} \
- CFLAGS="%{rpmcflags}"
+ --disable-silent-rules
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -75,17 +71,32 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README* data/COPYING.* docs/html
+%doc AUTHORS ChangeLog NEWS README data/COPYING.* docs/html
%attr(755,root,root) %{_bindir}/tvtime
%attr(755,root,root) %{_bindir}/tvtime-command
%attr(755,root,root) %{_bindir}/tvtime-configure
%attr(755,root,root) %{_bindir}/tvtime-scanner
%dir %{_sysconfdir}/tvtime
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tvtime/*.xml
-%{_desktopdir}/*.desktop
-%{_iconsdir}/hicolor/*/apps/tvtime.png
-%{_pixmapsdir}/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tvtime/tvtime.xml
+%{_datadir}/appdata/tvtime.appdata.xml
+%{_desktopdir}/tvtime.desktop
+%{_iconsdir}/hicolor/*x*/apps/tvtime.png
%{_datadir}/tvtime
-%{_mandir}/man?/*
-%lang(de) %{_mandir}/de/man?/*
-%lang(es) %{_mandir}/es/man?/*
+%{_mandir}/man1/tvtime.1*
+%{_mandir}/man1/tvtime-command.1*
+%{_mandir}/man1/tvtime-configure.1*
+%{_mandir}/man1/tvtime-scanner.1*
+%{_mandir}/man5/stationlist.xml.5*
+%{_mandir}/man5/tvtime.xml.5*
+%lang(de) %{_mandir}/de/man1/tvtime.1*
+%lang(de) %{_mandir}/de/man1/tvtime-command.1*
+%lang(de) %{_mandir}/de/man1/tvtime-configure.1*
+%lang(de) %{_mandir}/de/man1/tvtime-scanner.1*
+%lang(de) %{_mandir}/de/man5/stationlist.xml.5*
+%lang(de) %{_mandir}/de/man5/tvtime.xml.5*
+%lang(es) %{_mandir}/es/man1/tvtime.1*
+%lang(es) %{_mandir}/es/man1/tvtime-command.1*
+%lang(es) %{_mandir}/es/man1/tvtime-configure.1*
+%lang(es) %{_mandir}/es/man1/tvtime-scanner.1*
+%lang(es) %{_mandir}/es/man5/stationlist.xml.5*
+%lang(es) %{_mandir}/es/man5/tvtime.xml.5*
diff --git a/tvtime-autodetect_textured_overlay.patch b/tvtime-autodetect_textured_overlay.patch
index c519302..74151a9 100644
--- a/tvtime-autodetect_textured_overlay.patch
+++ b/tvtime-autodetect_textured_overlay.patch
@@ -1,44 +1,39 @@
---- tvtime-1.0.2/src/xvoutput.c.orig 2005-08-14 19:35:50.000000000 +0200
-+++ tvtime-1.0.2/src/xvoutput.c 2010-03-06 19:43:26.000000000 +0100
-@@ -123,15 +123,37 @@
+--- tvtime-1.0.10/src/xvoutput.c.orig 2016-07-03 17:21:29.935850686 +0200
++++ tvtime-1.0.10/src/xvoutput.c 2016-07-03 21:09:03.995213629 +0200
+@@ -113,7 +113,7 @@
+ unsigned int release;
+ unsigned int dummy;
+ unsigned int adaptors;
+- unsigned int i;
++ unsigned int i, txtFlag;
+ unsigned long j;
+ int has_fourcc = 0;
+ XvAdaptorInfo *adaptorInfo;
+@@ -128,15 +128,17 @@
XvQueryAdaptors( display, output_window, &adaptors, &adaptorInfo );
-+ /* first attempt: check for textured layers with yuv2... */
-+ for( i = 0; i < adaptors; i++ ) {
-+ if(( adaptorInfo[ i ].type & XvImageMask ) && ( strstr( adaptorInfo[ i ].name, "Textured" ) != NULL )) {
-+ for( j = 0; j < adaptorInfo[ i ].num_ports; j++ ) {
-+ XvPortID port = adaptorInfo[ i ].base_id + j;
-+ if( xv_port_has_yuy2( port ) ) {
-+ if( XvGrabPort( display, port, 0 ) == Success ) {
-+ xv_port = port;
-+ if( xvoutput_verbose ) {
-+ fprintf( stderr, "xvoutput: Using TEXTURED XVIDEO adaptor %lu: %s.\n",
-+ port, adaptorInfo[ i ].name );
-+ }
-+ XvFreeAdaptorInfo( adaptorInfo );
-+ return 1;
-+ }
-+ has_yuy2 = 1;
-+ }
-+ }
-+ }
-+ }
-+ /* second attempt: check only for layers with yuv2... */
++ for( txtFlag = 0; txtFlag <= 1; txtFlag++ ) { // try "Textured" first, then any
for( i = 0; i < adaptors; i++ ) {
- if( adaptorInfo[ i ].type & XvImageMask ) {
+- if( adaptorInfo[ i ].type & XvImageMask ) {
++ if( (adaptorInfo[ i ].type & XvImageMask) && ((txtFlag > 0) || (strstr( adaptorInfo[ i ].name, "Textured" ) != NULL)) ) {
for( j = 0; j < adaptorInfo[ i ].num_ports; j++ ) {
-- if( xv_port_has_yuy2( adaptorInfo[ i ].base_id + j ) ) {
-- if( XvGrabPort( display, adaptorInfo[ i ].base_id + j, 0 ) == Success ) {
-- xv_port = adaptorInfo[ i ].base_id + j;
-+ XvPortID port = adaptorInfo[ i ].base_id + j;
-+ if( xv_port_has_yuy2( port ) ) {
-+ if( XvGrabPort( display, port, 0 ) == Success ) {
-+ xv_port = port;
+ if( xv_port_has_fourcc( adaptorInfo[ i ].base_id + j,
+ fourcc_id, fourcc_str ) ) {
+ if( XvGrabPort( display, adaptorInfo[ i ].base_id + j, 0 ) == Success ) {
+ xv_port = adaptorInfo[ i ].base_id + j;
if( xvoutput_verbose ) {
- fprintf( stderr, "xvoutput: Using XVIDEO adaptor %lu: %s.\n",
-- adaptorInfo[ i ].base_id + j, adaptorInfo[ i ].name );
-+ port, adaptorInfo[ i ].name );
+- fprintf( stderr, "xvoutput: Using XVIDEO adaptor %lu: %s.\n",
++ fprintf( stderr, "xvoutput: Using %sXVIDEO adaptor %lu: %s.\n",
++ (txtFlag == 0) ? "TEXTURED " : "",
+ adaptorInfo[ i ].base_id + j, adaptorInfo[ i ].name );
}
XvFreeAdaptorInfo( adaptorInfo );
- return 1;
+@@ -148,6 +150,7 @@
+ }
+ }
+ }
++ }
+
+ XvFreeAdaptorInfo( adaptorInfo );
+
diff --git a/tvtime-def_user.patch b/tvtime-def_user.patch
deleted file mode 100644
index e426f6d..0000000
--- a/tvtime-def_user.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/videodev2.h.orig 2005-01-17 03:36:40.000000000 +0100
-+++ src/videodev2.h 2007-07-09 23:19:59.346188344 +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
diff --git a/tvtime-desktop.patch b/tvtime-desktop.patch
deleted file mode 100644
index adf0018..0000000
--- a/tvtime-desktop.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- tvtime-0.9.15/docs/net-tvtime.desktop.old 2005-03-17 17:24:55.277334752 +0100
-+++ tvtime-0.9.15/docs/net-tvtime.desktop 2005-03-17 17:31:19.203969032 +0100
-@@ -7,4 +7,4 @@
- GenericName=Television Viewer
- Terminal=false
- Type=Application
--Categories=Application;AudioVideo;
-+Categories=Video;TV;
diff --git a/tvtime-format.patch b/tvtime-format.patch
deleted file mode 100644
index 73c2e94..0000000
--- a/tvtime-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvtime-1.0.2/src/tvtimeosd.c~ 2005-09-08 03:05:18.000000000 +0200
-+++ tvtime-1.0.2/src/tvtimeosd.c 2013-11-03 21:24:40.366698423 +0100
-@@ -558,7 +558,7 @@
-
- void tvtime_osd_set_audio_mode( tvtime_osd_t *osd, const char *audiomode )
- {
-- snprintf( osd->audiomode_text, sizeof( osd->audiomode_text ), audiomode );
-+ snprintf( osd->audiomode_text, sizeof( osd->audiomode_text ), "%s", audiomode );
- }
-
- void tvtime_osd_set_channel_number( tvtime_osd_t *osd, const char *text )
diff --git a/tvtime-gcc.patch b/tvtime-gcc.patch
deleted file mode 100644
index e0b7d94..0000000
--- a/tvtime-gcc.patch
+++ /dev/null
@@ -1,80 +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
---- tvtime-1.0.2/src/xmltv.c.orig 2004-09-26 18:40:01.000000000 +0200
-+++ tvtime-1.0.2/src/xmltv.c 2010-01-20 19:25:00.239975523 +0100
-@@ -118,9 +118,9 @@
- typedef struct {
- const char *code;
- const char *name;
--} locale_t;
-+} locale_s;
-
--static locale_t locale_table[] = {
-+static locale_s 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( locale_s );
-
- /**
- * Timezone parsing code based loosely on the algorithm in
diff --git a/tvtime-libpng-1.5.patch b/tvtime-libpng-1.5.patch
deleted file mode 100644
index bfa22ed..0000000
--- a/tvtime-libpng-1.5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Include zlib.h which is no longer implicitly included with libpng-1.5
-Bug 369663
-
-diff -ru tvtime-111b28cca42d.orig/src/pngoutput.c tvtime-111b28cca42d/src/pngoutput.c
---- tvtime-111b28cca42d.orig/src/pngoutput.c 2011-02-01 02:35:26.000000000 +0100
-+++ tvtime-111b28cca42d/src/pngoutput.c 2011-06-02 13:36:55.965999463 +0200
-@@ -18,6 +18,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <zlib.h>
- #include <png.h>
- #include "pngoutput.h"
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tvtime.git/commitdiff/1a494fb5c4495dd3050d949df4b872a7166782ca
More information about the pld-cvs-commit
mailing list