summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorshannonjr <shannonjr@pkgsrc.org>2004-08-02 19:09:45 +0000
committershannonjr <shannonjr@pkgsrc.org>2004-08-02 19:09:45 +0000
commitda9c92c95236f541d671b2f6ee83b527325ed88d (patch)
tree1ce4f20163274d6c3d40b0d8abc1e9e25f9ad13a /multimedia
parent094154737f5b434d5f1ad50bcd09d6c37ba1e38f (diff)
downloadpkgsrc-da9c92c95236f541d671b2f6ee83b527325ed88d.tar.gz
There is a problem compiling multimedia/xine-lib in that the "extra"
assembly language module zoom_filter_xmmx.c breaks when optimized. Some googling indicates that this is also encountered with FreeBSD and Linux. A review of the CVS tree for xine shows that this module has been removed. As as module is only built if MMX is detected (HAVE_FFMMX defined) removing the module should not break anything; that is the approach taken in this new patch that removes building zoom_filter_xmmx from Makefile.in for xineplug_post_goom.la
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xine-lib/distinfo3
-rw-r--r--multimedia/xine-lib/patches/patch-aw26
2 files changed, 28 insertions, 1 deletions
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 15d5ea337f0..1e14d696b24 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/06/21 15:55:55 drochner Exp $
+$NetBSD: distinfo,v 1.7 2004/08/02 19:09:45 shannonjr Exp $
SHA1 (xine-lib-1-rc5.tar.gz) = b38aa71ab717ba04f03591d1d003da4ce23ed1cf
Size (xine-lib-1-rc5.tar.gz) = 7052663 bytes
@@ -20,3 +20,4 @@ SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
SHA1 (patch-at) = b43d07b20f209a31df454620673a21f174550cf9
SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e
SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
+SHA1 (patch-aw) = 748feea39a7c41f40e56f463dde9186430c2a74f
diff --git a/multimedia/xine-lib/patches/patch-aw b/multimedia/xine-lib/patches/patch-aw
new file mode 100644
index 00000000000..51cf30419b5
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-aw
@@ -0,0 +1,26 @@
+$NetBSD: patch-aw,v 1.1 2004/08/02 19:09:45 shannonjr Exp $
+
+--- src/post/goom/Makefile.in.orig 2004-06-20 18:23:58.000000000 -0600
++++ src/post/goom/Makefile.in
+@@ -412,7 +412,6 @@ EXTRA_DIST = zoom_filter_mmx.c zoom_filt
+
+ lib_LTLIBRARIES = xineplug_post_goom.la
+
+-@HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@extra_files = zoom_filter_mmx.c zoom_filter_xmmx.c
+ @HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@MMX_CFLAG = -DHAVE_MMX
+
+ xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \
+@@ -445,12 +444,10 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
+
+ xineplug_post_goom_la_DEPENDENCIES = \
+ $(top_builddir)/src/xine-engine/libxine.la
+-am__xineplug_post_goom_la_SOURCES_DIST = zoom_filter_mmx.c \
++am__xineplug_post_goom_la_SOURCES_DIST = _mmx.c \
+ zoom_filter_xmmx.c xine_goom.c goom_core.c filters.c lines.c \
+ ifs_display.c ifs.c graphic.c gfontlib.c gfontrle.c surf3d.c \
+ surface.c tentacle3d.c
+-@HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@am__objects_1 = zoom_filter_mmx.lo \
+-@HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@ zoom_filter_xmmx.lo
+ am_xineplug_post_goom_la_OBJECTS = $(am__objects_1) xine_goom.lo \
+ goom_core.lo filters.lo lines.lo ifs_display.lo ifs.lo \
+ graphic.lo gfontlib.lo gfontrle.lo surf3d.lo surface.lo \