[PATCH] gnu: Add tvtime.

[PATCH] gnu: Add tvtime.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 143 bytes --]

This software has not been maintained for several years, so it needs 4
patches to be build successfully.  I hope it's not too much for us :-)


[-- Attachment #2: 0001-gnu-Add-tvtime.patch --]
[-- Type: text/x-patch, Size: 10184 bytes --]

From dcc331e7ab3fd0687c5a4ef8f084bc0bf4ca1cef Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Tue, 28 Apr 2015 22:21:37 +0300
Subject: [PATCH] gnu: Add tvtime.

* gnu/packages/tvtime.scm,
  gnu/packages/patches/tvtime-gcc41.patch,
  gnu/packages/patches/tvtime-pngoutput.patch,
  gnu/packages/patches/tvtime-videodev2.patch,
  gnu/packages/patches/tvtime-xmltv.patch: New files.
* gnu-system.am (GNU_SYSTEM_MODULES): Add package.
  (dist_patch_DATA): Add patches.
---
 gnu-system.am                               |  5 +++
 gnu/packages/patches/tvtime-gcc41.patch     | 58 ++++++++++++++++++++++++++
 gnu/packages/patches/tvtime-pngoutput.patch | 15 +++++++
 gnu/packages/patches/tvtime-videodev2.patch | 15 +++++++
 gnu/packages/patches/tvtime-xmltv.patch     | 28 +++++++++++++
 gnu/packages/tvtime.scm                     | 64 +++++++++++++++++++++++++++++
 6 files changed, 185 insertions(+)
 create mode 100644 gnu/packages/patches/tvtime-gcc41.patch
 create mode 100644 gnu/packages/patches/tvtime-pngoutput.patch
 create mode 100644 gnu/packages/patches/tvtime-videodev2.patch
 create mode 100644 gnu/packages/patches/tvtime-xmltv.patch
 create mode 100644 gnu/packages/tvtime.scm

diff --git a/gnu-system.am b/gnu-system.am
index ae6b4e2..5061548 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -290,6 +290,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/tmux.scm				\
   gnu/packages/tor.scm				\
   gnu/packages/tre.scm				\
+  gnu/packages/tvtime.scm			\
   gnu/packages/unrtf.scm			\
   gnu/packages/upnp.scm				\
   gnu/packages/uucp.scm				\
@@ -543,6 +544,10 @@ dist_patch_DATA =						\
   gnu/packages/patches/teckit-cstdio.patch			\
   gnu/packages/patches/texi2html-document-encoding.patch	\
   gnu/packages/patches/texi2html-i18n.patch			\
+  gnu/packages/patches/tvtime-gcc41.patch			\
+  gnu/packages/patches/tvtime-pngoutput.patch			\
+  gnu/packages/patches/tvtime-videodev2.patch			\
+  gnu/packages/patches/tvtime-xmltv.patch			\
   gnu/packages/patches/udev-gir-libtool.patch			\
   gnu/packages/patches/unzip-CVE-2014-8139.patch		\
   gnu/packages/patches/unzip-CVE-2014-8140.patch		\
diff --git a/gnu/packages/patches/tvtime-gcc41.patch b/gnu/packages/patches/tvtime-gcc41.patch
new file mode 100644
index 0000000..d6e4272
--- /dev/null
+++ b/gnu/packages/patches/tvtime-gcc41.patch
@@ -0,0 +1,58 @@
+Source: https://projects.archlinux.org/svntogit/community.git/tree/trunk/tvtime-1.0.2-gcc41.patch?h=packages/tvtime
+
+--- 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
diff --git a/gnu/packages/patches/tvtime-pngoutput.patch b/gnu/packages/patches/tvtime-pngoutput.patch
new file mode 100644
index 0000000..0d14f77
--- /dev/null
+++ b/gnu/packages/patches/tvtime-pngoutput.patch
@@ -0,0 +1,15 @@
+Source: https://sources.debian.net/src/tvtime/1.0.2-14/debian/patches/libpng.diff
+
+From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date: Mon, 14 May 2012 19:01:31 +0900
+Prepares the package for libpng 1.5.  Closes: #650582.
+
+--- tvtime-1.0.2.orig/src/pngoutput.c
++++ tvtime-1.0.2/src/pngoutput.c
+@@ -18,5 +18,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <zlib.h>
+ #include <png.h>
+ #include "pngoutput.h" 
diff --git a/gnu/packages/patches/tvtime-videodev2.patch b/gnu/packages/patches/tvtime-videodev2.patch
new file mode 100644
index 0000000..74131f2
--- /dev/null
+++ b/gnu/packages/patches/tvtime-videodev2.patch
@@ -0,0 +1,15 @@
+Fix compilation error: non-existing header file.
+
+This is an excerpt from the debian patch:
+http://http.debian.net/debian/pool/main/t/tvtime/tvtime_1.0.2-14.diff.gz
+
+--- tvtime-1.0.2.orig/src/videodev2.h
++++ tvtime-1.0.2/src/videodev2.h
+@@ -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/gnu/packages/patches/tvtime-xmltv.patch b/gnu/packages/patches/tvtime-xmltv.patch
new file mode 100644
index 0000000..2f4afc6
--- /dev/null
+++ b/gnu/packages/patches/tvtime-xmltv.patch
@@ -0,0 +1,28 @@
+Fix compilation error: conflicting types for 'locale_t'.
+
+This is an excerpt from the debian patch ... 
+http://http.debian.net/debian/pool/main/t/tvtime/tvtime_1.0.2-14.diff.gz
+
+--- 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/gnu/packages/tvtime.scm b/gnu/packages/tvtime.scm
new file mode 100644
index 0000000..f25343a
--- /dev/null
+++ b/gnu/packages/tvtime.scm
@@ -0,0 +1,64 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages tvtime)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages fontutils))
+
+(define-public tvtime
+  (package
+    (name "tvtime")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/tvtime/tvtime-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "08q5gzbyz0lxb730rz6d6amkzimlc7nanv6n50j2bpw4n2xa9wmf"))
+              (patches (list (search-patch "tvtime-videodev2.patch")
+                             (search-patch "tvtime-pngoutput.patch")
+                             (search-patch "tvtime-xmltv.patch")
+                             (search-patch "tvtime-gcc41.patch")))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libx11"      ,libx11)
+       ("libxext"     ,libxext)
+       ("libxt"       ,libxt)
+       ("libxtst"     ,libxtst)
+       ("libxinerama" ,libxinerama)
+       ("libxv"       ,libxv)
+       ("libxxf86vm"  ,libxxf86vm)
+       ("libpng"      ,libpng)
+       ("libxml2"     ,libxml2)
+       ("freetype"    ,freetype)
+       ("zlib"        ,zlib)))
+    (home-page "http://tvtime.sourceforge.net")
+    (synopsis "High quality television application")
+    (description
+     "Tvtime processes the input from your video capture card and
+displays it on a monitor.  It focuses on a high visual quality.")
+    (license license:gpl2+)))
-- 
2.2.1

Re: [PATCH] gnu: Add tvtime.

[Eric Bavier]

On 2015-04-28 15:18, Alex Kost wrote:
> From dcc331e7ab3fd0687c5a4ef8f084bc0bf4ca1cef Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Tue, 28 Apr 2015 22:21:37 +0300
> Subject: [PATCH] gnu: Add tvtime.
> 
> * gnu/packages/tvtime.scm,
>   gnu/packages/patches/tvtime-gcc41.patch,
>   gnu/packages/patches/tvtime-pngoutput.patch,
>   gnu/packages/patches/tvtime-videodev2.patch,
>   gnu/packages/patches/tvtime-xmltv.patch: New files.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add package.
>   (dist_patch_DATA): Add patches.

Perhaps we could name the file "tv.scm", in anticipation of other 
TV-related code?

> +    (inputs
> +     `(("libx11"      ,libx11)
> +       ("libxt"       ,libxt)
> +       ("libxtst"     ,libxtst)
> +       ("libxinerama" ,libxinerama)
> +       ("libxv"       ,libxv)
> +       ("libxxf86vm"  ,libxxf86vm)
> +       ("libpng"      ,libpng)
> +       ("libxml2"     ,libxml2)
> +       ("freetype"    ,freetype)
> +       ("zlib"        ,zlib)))

I think we were lately trying to stay away from aligning inputs like 
this (ISTR Ludo requesting it not be done on some other patch reviews).  
Not sure where the consensus is yet.

> +    (synopsis "High quality television application")

How about "Television viewer"?

Otherwise the rest look good to me.

Re: [PATCH] gnu: Add tvtime.

[Alex Kost]

Eric Bavier (2015-04-29 01:14 +0300) wrote:

> On 2015-04-28 15:18, Alex Kost wrote:
>> From dcc331e7ab3fd0687c5a4ef8f084bc0bf4ca1cef Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Tue, 28 Apr 2015 22:21:37 +0300
>> Subject: [PATCH] gnu: Add tvtime.
>>
>> * gnu/packages/tvtime.scm,
>>   gnu/packages/patches/tvtime-gcc41.patch,
>>   gnu/packages/patches/tvtime-pngoutput.patch,
>>   gnu/packages/patches/tvtime-videodev2.patch,
>>   gnu/packages/patches/tvtime-xmltv.patch: New files.
>> * gnu-system.am (GNU_SYSTEM_MODULES): Add package.
>>   (dist_patch_DATA): Add patches.
>
> Perhaps we could name the file "tv.scm", in anticipation of other
> TV-related code?

Indeed, I think it would be better, thanks!

>> +    (inputs
>> +     `(("libx11"      ,libx11)
>> +       ("libxt"       ,libxt)
>> +       ("libxtst"     ,libxtst)
>> +       ("libxinerama" ,libxinerama)
>> +       ("libxv"       ,libxv)
>> +       ("libxxf86vm"  ,libxxf86vm)
>> +       ("libpng"      ,libpng)
>> +       ("libxml2"     ,libxml2)
>> +       ("freetype"    ,freetype)
>> +       ("zlib"        ,zlib)))
>
> I think we were lately trying to stay away from aligning inputs like
> this (ISTR Ludo requesting it not be done on some other patch reviews).
> Not sure where the consensus is yet.

OK, I'm going to remove the aligning.

>> +    (synopsis "High quality television application")
>
> How about "Television viewer"?

I don't mind.  Synopsis/description is always the hardest part for me :-)

> Otherwise the rest look good to me.

Thanks for reviewing.

-- 
Alex

Re: [PATCH] gnu: Add tvtime.

[Alex Kost]

Alex Kost (2015-04-29 12:31 +0300) wrote:

> Eric Bavier (2015-04-29 01:14 +0300) wrote:
>
>> On 2015-04-28 15:18, Alex Kost wrote:
>>> From dcc331e7ab3fd0687c5a4ef8f084bc0bf4ca1cef Mon Sep 17 00:00:00 2001
>>> From: Alex Kost <alezost@gmail.com>
>>> Date: Tue, 28 Apr 2015 22:21:37 +0300
>>> Subject: [PATCH] gnu: Add tvtime.
>>>
>>> * gnu/packages/tvtime.scm,
>>>   gnu/packages/patches/tvtime-gcc41.patch,
>>>   gnu/packages/patches/tvtime-pngoutput.patch,
>>>   gnu/packages/patches/tvtime-videodev2.patch,
>>>   gnu/packages/patches/tvtime-xmltv.patch: New files.
>>> * gnu-system.am (GNU_SYSTEM_MODULES): Add package.
>>>   (dist_patch_DATA): Add patches.
>>
>> Perhaps we could name the file "tv.scm", in anticipation of other
>> TV-related code?
>
> Indeed, I think it would be better, thanks!
>
>>> +    (inputs
>>> +     `(("libx11"      ,libx11)
>>> +       ("libxt"       ,libxt)
>>> +       ("libxtst"     ,libxtst)
>>> +       ("libxinerama" ,libxinerama)
>>> +       ("libxv"       ,libxv)
>>> +       ("libxxf86vm"  ,libxxf86vm)
>>> +       ("libpng"      ,libpng)
>>> +       ("libxml2"     ,libxml2)
>>> +       ("freetype"    ,freetype)
>>> +       ("zlib"        ,zlib)))
>>
>> I think we were lately trying to stay away from aligning inputs like
>> this (ISTR Ludo requesting it not be done on some other patch reviews).
>> Not sure where the consensus is yet.
>
> OK, I'm going to remove the aligning.
>
>>> +    (synopsis "High quality television application")
>>
>> How about "Television viewer"?
>
> I don't mind.  Synopsis/description is always the hardest part for me :-)
>
>> Otherwise the rest look good to me.
>
> Thanks for reviewing.

I'm going to commit it (taking into account Eric's notes), If no one
objects.

-- 
Alex