the tvtime postprocessing plugin doesn't link on amd64. appears

to be an assembly problem in the tomsmocomp filter, but strangely
this was building before, and the code did not change.

so, only build/install the tvtime plugin on i386, until the problem
is resolved.
This commit is contained in:
jakemsr 2008-03-27 01:35:02 +00:00
parent 94b49001c6
commit 2f5a08edae
5 changed files with 35 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2008/03/24 03:26:34 jakemsr Exp $
# $OpenBSD: Makefile,v 1.30 2008/03/27 01:35:02 jakemsr Exp $
COMMENT-main= multimedia decoding library
COMMENT-esd= esound audio output module for xine-lib
@ -7,7 +7,7 @@ COMMENT-jack= jackd audio output module for xine-lib
V= 1.1.11
DISTNAME= xine-lib-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
PKGNAME-jack= xine-lib-jack-${V}
@ -80,6 +80,12 @@ LIBTOOL_FLAGS+= --tag=disable-static
XINEAPI_REV= 1.20
SUBST_VARS+= XINEAPI_REV
.if ${MACHINE_ARCH} == "i386"
MAKE_FLAGS+= TOMSMOCOMP_LINKS=
.else
MAKE_FLAGS+= TOMSMOCOMP_LINKS=\#
.endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-optimizations \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.1 2008/03/27 01:35:02 jakemsr Exp $
--- src/post/deinterlace/Makefile.in.orig Wed Mar 26 16:59:42 2008
+++ src/post/deinterlace/Makefile.in Wed Mar 26 17:24:02 2008
@@ -415,7 +415,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
vidixdir = $(XINE_PLUGINDIR)/vidix
SUBDIRS = plugins
EXTRA_DIST =
-xinepost_LTLIBRARIES = xineplug_post_tvtime.la
+${TOMSMOCOMP_LINKS}xinepost_LTLIBRARIES = xineplug_post_tvtime.la
xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
deinterlace.c pulldown.c speedy.c tvtime.c

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.1 2008/03/27 01:35:02 jakemsr Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Wed Mar 26 17:00:23 2008
+++ src/post/deinterlace/plugins/Makefile.in Wed Mar 26 17:00:40 2008
@@ -847,7 +847,7 @@ maintainer-clean-generic:
-rm -f Makefile.in
# Avoid "can't find register" failures with -O0, -O2, -O3 (gcc 4.0)
-libdeinterlaceplugins_la-kdetv_greedyh.o libdeinterlaceplugins_la-kdetv_greedyh.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/$$/ -O1/')
+# libdeinterlaceplugins_la-kdetv_greedyh.o libdeinterlaceplugins_la-kdetv_greedyh.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/$$/ -O1/')
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.i386-main,v 1.2 2008/03/24 03:26:34 jakemsr Exp $
@comment $OpenBSD: PFRAG.i386-main,v 1.3 2008/03/27 01:35:02 jakemsr Exp $
lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_tvtime.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_qt.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_w32dll.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2008/03/24 03:26:34 jakemsr Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2008/03/27 01:35:02 jakemsr Exp $
@pkgpath multimedia/xine-lib
%%i386%%
bin/xine-config
@ -54,7 +54,6 @@ lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_goom.so
lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_mosaico.so
lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_planar.so
lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_switch.so
lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_tvtime.so
lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_visualizations.so
@comment lib/xine/plugins/${XINEAPI_REV}/vidix/
lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_file.so