mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-04-15 21:33:31 +02:00
Removing outdated tvtime version
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
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],
|
||||
@@ -1,69 +0,0 @@
|
||||
diff -Naur tvtime.orig/configure.ac tvtime/configure.ac
|
||||
--- tvtime.orig/configure.ac 2011-02-01 02:35:26.000000000 +0100
|
||||
+++ tvtime/configure.ac 2011-05-29 21:45:16.825993007 +0200
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
# Check for compilers.
|
||||
AC_PROG_CC
|
||||
+AM_PROG_CC_C_O
|
||||
AC_CHECK_PROG(found_cc, "$CC", yes, no)
|
||||
test "x$found_cc" = "xyes" || exit 1
|
||||
|
||||
@@ -18,7 +19,6 @@
|
||||
test "x$found_cxx" = "xyes" || exit 1
|
||||
|
||||
# Check for libtool.
|
||||
-AC_PROG_LIBTOOL
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
@@ -67,10 +67,7 @@
|
||||
dnl freetype
|
||||
dnl ---------------------------------------------
|
||||
dnl Test for freetype
|
||||
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
|
||||
-if test "$FREETYPE_CONFIG" = "no" ; then
|
||||
- AC_MSG_ERROR(freetype2 needed and freetype-config not found)
|
||||
-fi
|
||||
+PKG_CHECK_MODULES([TTF], [freetype2])
|
||||
|
||||
dnl ---------------------------------------------
|
||||
dnl libxml2
|
||||
diff -Naur tvtime.orig/src/Makefile.am tvtime/src/Makefile.am
|
||||
--- tvtime.orig/src/Makefile.am 2011-02-01 02:35:26.000000000 +0100
|
||||
+++ tvtime/src/Makefile.am 2011-05-29 21:42:32.156993111 +0200
|
||||
@@ -19,9 +19,6 @@
|
||||
tmpdir = /tmp
|
||||
localedir = $(datadir)/locale
|
||||
|
||||
-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
|
||||
-TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
|
||||
-
|
||||
# Set the following if you want to specify an additional font directory
|
||||
# FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
|
||||
|
||||
@@ -76,20 +73,20 @@
|
||||
tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \
|
||||
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
|
||||
$(FONT_CFLAGS) $(AM_CFLAGS)
|
||||
-tvtime_LDFLAGS = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
|
||||
+tvtime_LDADD = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
|
||||
$(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++
|
||||
|
||||
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
|
||||
tvtime-command.c
|
||||
tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
|
||||
-tvtime_command_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
|
||||
+tvtime_command_LDADD = $(ZLIB_LIBS) $(XML2_LIBS)
|
||||
tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
|
||||
tvtime-configure.c
|
||||
tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
|
||||
-tvtime_configure_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
|
||||
+tvtime_configure_LDADD = $(ZLIB_LIBS) $(XML2_LIBS)
|
||||
tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
|
||||
tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
|
||||
mixer.h mixer.c
|
||||
tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
|
||||
-tvtime_scanner_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
|
||||
+tvtime_scanner_LDADD = $(ZLIB_LIBS) $(XML2_LIBS)
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
Quick fix for building with newer autoconf where mkinstalldirs is no longer
|
||||
available.
|
||||
|
||||
Upstream: no
|
||||
Author: Alex Legler <a3li@gentoo.org>
|
||||
|
||||
diff -Naur tvtime.orig/po/Makefile.in.in tvtime/po/Makefile.in.in
|
||||
--- tvtime.orig/po/Makefile.in.in 2011-02-01 02:35:26.000000000 +0100
|
||||
+++ tvtime/po/Makefile.in.in 2011-05-29 22:16:54.093991811 +0200
|
||||
@@ -26,8 +26,11 @@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
-MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
|
||||
+
|
||||
+mkdir_p = $(SHELL) @install_sh@ -d
|
||||
+install_sh = $(SHELL) @install_sh@
|
||||
+MKDIR_P = @MKDIR_P@
|
||||
+mkdir_p = @mkdir_p@
|
||||
|
||||
GMSGFMT = @GMSGFMT@
|
||||
MSGFMT = @MSGFMT@
|
||||
@@ -137,7 +140,7 @@
|
||||
install-exec:
|
||||
install-data: install-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||||
for file in $(DISTFILES.common) Makevars.template; do \
|
||||
$(INSTALL_DATA) $(srcdir)/$$file \
|
||||
$(DESTDIR)$(gettextsrcdir)/$$file; \
|
||||
@@ -150,13 +153,13 @@
|
||||
fi
|
||||
install-data-no: all
|
||||
install-data-yes: all
|
||||
- $(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
+ $(mkdir_p) $(DESTDIR)$(datadir)
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
- $(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||
+ $(mkdir_p) $(DESTDIR)$$dir; \
|
||||
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
|
||||
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
|
||||
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
|
||||
@@ -196,19 +199,19 @@
|
||||
installdirs-exec:
|
||||
installdirs-data: installdirs-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
installdirs-data-no:
|
||||
installdirs-data-yes:
|
||||
- $(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
+ $(mkdir_p) $(DESTDIR)$(datadir)
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
- $(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||
+ $(mkdir_p) $(DESTDIR)$$dir; \
|
||||
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
|
||||
if test -n "$$lc"; then \
|
||||
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Naur tvtime.orig/src/Makefile.am tvtime/src/Makefile.am
|
||||
--- tvtime.orig/src/Makefile.am 2011-02-01 02:35:26.000000000 +0100
|
||||
+++ tvtime/src/Makefile.am 2011-05-29 21:39:08.739993239 +0200
|
||||
@@ -77,7 +77,7 @@
|
||||
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
|
||||
$(FONT_CFLAGS) $(AM_CFLAGS)
|
||||
tvtime_LDFLAGS = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
|
||||
- $(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lstdc++
|
||||
+ $(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++
|
||||
|
||||
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
|
||||
tvtime-command.c
|
||||
@@ -1,11 +0,0 @@
|
||||
--- src/Makefile.am.orig 2011-10-14 22:21:20.897781921 +0200
|
||||
+++ src/Makefile.am 2011-10-14 22:21:30.368781581 +0200
|
||||
@@ -74,7 +74,7 @@
|
||||
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
|
||||
$(FONT_CFLAGS) $(AM_CFLAGS)
|
||||
tvtime_LDADD = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
|
||||
- $(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++
|
||||
+ $(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++ -lpthread
|
||||
|
||||
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
|
||||
tvtime-command.c
|
||||
@@ -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"
|
||||
|
||||
@@ -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(__x86_64__)
|
||||
#define cpuid(op,eax,ebx,ecx,edx) \
|
||||
__asm__ ("cpuid" \
|
||||
: "=a" (eax), \
|
||||
Reference in New Issue
Block a user