[SM-Commit] GIT changes to master =?unknown-8bit?Q?gri?= =?unknown-8bit?Q?moire_by_Andra=C5?= =?unknown-8bit?Q?=BE?= Levstik (fee0ff811ab675a5f13a37461eb431828291cd76)

=?unknown-8bit?Q?Andra=C5=BE?= Levstik scm at mail.sourcemage.org
Thu Sep 28 04:46:42 EDT 2006


GIT changes to master grimoire by Andraž Levstik <ruskie at mages.ath.cx>:

 video/tvtime/DEPENDS                     |   12 ++++++++++-
 video/tvtime/DETAILS                     |    7 ++----
 video/tvtime/HISTORY                     |    7 ++++++
 video/tvtime/PRE_BUILD                   |    7 ++++++
 video/tvtime/tvtime-1.0.2-xinerama.patch |   32 +++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 5 deletions(-)

New commits:
commit c6357171c3933c7e3384740cda6363680778acc2
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    tvtime: update to 1.0.2

diff --git a/video/tvtime/DEPENDS b/video/tvtime/DEPENDS
index 8d0527b..bbf26e7 100755
--- a/video/tvtime/DEPENDS
+++ b/video/tvtime/DEPENDS
@@ -1,4 +1,14 @@
 depends  libpng     &&
 depends  freetype2  &&
 depends  libxml2    &&
-depends  X11-LIBS
+depends  X11-LIBS   &&
+. $GRIMOIRE/FUNCTIONS
+if check_if_xorg_modular_libs ; then
+  depends libice  &&
+  depends libxtst &&
+  optional_depends libxinerama           \
+                   ""                    \
+                   "--without-xinerama"  \
+                   "Enable xinerama support"
+fi
+
diff --git a/video/tvtime/DETAILS b/video/tvtime/DETAILS
index 78e86ab..cdde786 100755
--- a/video/tvtime/DETAILS
+++ b/video/tvtime/DETAILS
@@ -1,15 +1,14 @@
            SPELL=tvtime
-         VERSION=1.0.1
+         VERSION=1.0.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
         WEB_SITE=http://tvtime.sourceforge.net
-     SOURCE_HASH=sha512:ae428154fc6e9f564aee35de1200201f090dc4371155c0ef541a3c607b50d0f3008cc0138bbfe7fa0337ffe117e9b0a08f3c984e7c751f4c0a60ee172e6e21b8
+     SOURCE_HASH=sha512:d62d6b351c08cab56a7589b8c0b40208acc34f8baf1d312ebf6eed0f079502e1fee5ec0cbdb15c4251d9d2ea1845380db07b253348263b6cb7daf5d1038c61ff
       LICENSE[0]=GPL
          ENTERED=20030923
-         UPDATED=20030923
             DOCS="README NEWS COPYING data/COPYING.* docs/html"
-        KEYWORDS="video"
+        KEYWORDS="video tv"
            SHORT="tvtime is a high quality television application"
 cat << EOF
 tvtime is a high quality television application for use with video capture
diff --git a/video/tvtime/HISTORY b/video/tvtime/HISTORY
index 00e32c9..64b5458 100644
--- a/video/tvtime/HISTORY
+++ b/video/tvtime/HISTORY
@@ -1,3 +1,10 @@
+2006-09-28 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: update to 1.0.2
+	* DEPENDS: update for -modular
+	* tvtime-1.0.2-xinerama.patch: added from:
+	  http://sourceforge.net/tracker/index.php?func=detail&aid=1403354&group_id=64301&atid=506989
+	* PRE_BUILD: some removal of extra qualifications
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/video/tvtime/PRE_BUILD b/video/tvtime/PRE_BUILD
new file mode 100755
index 0000000..b614096
--- /dev/null
+++ b/video/tvtime/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+patch -p1 < $SPELL_DIRECTORY/tvtime-1.0.2-xinerama.patch  &&
+sedit "s/DScalerFilterGreedyH:://g" plugins/greedyh.asm   &&
+sedit "s/DScalerFilterTomsMoComp:://g" plugins/tomsmocomp/TomsMoCompAll2.inc  &&
+sedit "s/DScalerFilterTomsMoComp:://g" plugins/tomsmocomp/TomsMoCompAll.inc  &&
+sedit "s/DScalerFilterTomsMoComp:://g" plugins/tomsmocomp.cpp
diff --git a/video/tvtime/tvtime-1.0.2-xinerama.patch b/video/tvtime/tvtime-1.0.2-xinerama.patch
new file mode 100644
index 0000000..0964d05
--- /dev/null
+++ b/video/tvtime/tvtime-1.0.2-xinerama.patch
@@ -0,0 +1,32 @@
+Index: tvtime-1.0.2/configure.ac
+===================================================================
+--- tvtime-1.0.2.orig/configure.ac
++++ tvtime-1.0.2/configure.ac
+@@ -99,6 +99,8 @@ dnl ------------------------------------
+ dnl check for X11, Xv and XF86VidModeExtension
+ dnl ---------------------------------------------
+ AC_PATH_XTRA
++AC_ARG_WITH([xinerama],
++    [AS_HELP_STRING([--without-xinerama], [Disable Xinerama extension support (default: check)])])
+ if test x"$no_x" != x"yes"; then
+     dnl check for Xshm
+     AC_CHECK_LIB([Xext],[XShmCreateImage],
+@@ -112,11 +114,13 @@ if test x"$no_x" != x"yes"; then
+ 	    X11_LIBS="$X11_LIBS -lXv"],,
+ 	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
+ 
+-	dnl check for Xinerama
+-	AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
+-	    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
+-	    X11_LIBS="$X11_LIBS -lXinerama"],,
+-	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
++	if test "x$with_xinerama" != "xno"; then
++		dnl check for Xinerama
++		AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
++		    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
++		    X11_LIBS="$X11_LIBS -lXinerama"],,
++		    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
++	fi
+ 
+ 	dnl check for XTest
+         AC_CHECK_LIB([Xtst],[XTestFakeKeyEvent],



More information about the SM-Commit mailing list