repair some damages:

-properly libtoolize some libraries to get dynamically loadable modules,
 use a hack from SDL to make libtool work with nasm (thanks wiz for
 the hint)
-run aclocal and autoconf, otherwise the autoconf version skew scews
 things up
 XXX we shouldn't use autoconf et al for the build but commit
 patches to configure and Makefile.in
-make sure we don't get trapped by the X11R6 freetype2 nonsense

6 files changed, 96 insertions, 8 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index a73fc1955f7..9ee8782eb68 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/05/10 13:47:07 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/12 16:19:32 drochner Exp $
 
 DISTNAME=	transcode-0.6.12
 PKGREVISION=	1
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--disable-qt
 # when libmpeg3 is a shlib.
 CONFIGURE_ARGS+=	--without-libmpeg3
 CONFIGURE_ARGS+=	--with-default-xvid=xvid4
+CONFIGURE_ARGS+=	--with-ft-prefix=${BUILDLINK_PREFIX.freetype2}
 
 .if exists(${X11BASE}/lib/libXv.so)
 PLIST_SUBST+=		FILTERPV=filter_pv.so
@@ -34,10 +35,11 @@ PLIST_SUBST+=		FILTERPV=filter_pv.a
 # this used to operate on acinclude.m4 and run aclocal, but running
 # aclocal here breaks due to missing DLFCN checking
 post-patch:
+	-cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF} && ${AUTOMAKE}
 	cd ${WRKSRC} && \
 	${SED} "s|/usr/local|${PREFIX}|g; s|include/libmpeg3|include/mpeg3|g; s|-ldl -lm|-lm|g" configure > configure.new && \
 	${MV} configure.new configure && ${CHMOD} a+x configure
-	-cd ${WRKSRC} && ${AUTOMAKE}
+	${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
 
 post-install:
 	${LN} -sf ../libxvidcore.so.4.0  ${PREFIX}/lib/transcode/libxvidcore.so.4
diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST
index 4eda3817262..09384dfde1b 100644
--- a/multimedia/transcode/PLIST
+++ b/multimedia/transcode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/12 16:19:32 drochner Exp $
 bin/avifix
 bin/aviindex
 bin/avimerge
@@ -50,10 +50,10 @@ lib/transcode/export_mp2enc.la
 lib/transcode/export_mp2enc.so
 lib/transcode/export_mp1e.la
 lib/transcode/export_mp1e.so
-lib/transcode/export_mpeg.a
 lib/transcode/export_mpeg.la
-lib/transcode/export_mpeg2enc.a
+lib/transcode/export_mpeg.so
 lib/transcode/export_mpeg2enc.la
+lib/transcode/export_mpeg2enc.so
 lib/transcode/export_net.la
 lib/transcode/export_net.so
 lib/transcode/export_null.la
@@ -77,8 +77,8 @@ lib/transcode/export_xvid3.la
 lib/transcode/export_xvid3.so
 lib/transcode/export_xvid4.la
 lib/transcode/export_xvid4.so
-lib/transcode/export_yuv4mpeg.a
 lib/transcode/export_yuv4mpeg.la
+lib/transcode/export_yuv4mpeg.so
 lib/transcode/filter_29to23.la
 lib/transcode/filter_29to23.so
 lib/transcode/filter_32detect.la
@@ -174,10 +174,12 @@ lib/transcode/filter_tc_audio.la
 lib/transcode/filter_tc_audio.so
 lib/transcode/filter_tc_video.la
 lib/transcode/filter_tc_video.so
-lib/transcode/filter_test.a
 lib/transcode/filter_test.la
+lib/transcode/filter_test.so
 lib/transcode/filter_testframe.la
 lib/transcode/filter_testframe.so
+lib/transcode/filter_text.la
+lib/transcode/filter_text.so
 lib/transcode/filter_unsharp.la
 lib/transcode/filter_unsharp.so
 lib/transcode/filter_videocore.la
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index a404929eb96..f8fc0fc9889 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/05/12 16:19:32 drochner Exp $
 
 SHA1 (transcode-0.6.12.tar.gz) = 3d9b223f804253a6a76d9645feb86609b0a2499a
 Size (transcode-0.6.12.tar.gz) = 3454807 bytes
@@ -17,3 +17,5 @@ SHA1 (patch-ap) = fb393e3400423a5d4225fb31afabfbcaa265a35b
 SHA1 (patch-aq) = 3a8bd7888460880767204239ac783bff3d6814a9
 SHA1 (patch-ar) = df0bf12044741c586b0168ead6aa0fa71a23aea1
 SHA1 (patch-as) = d673ec6009d96f55afcf8382f834edc2cadd2ae3
+SHA1 (patch-at) = f598541e1ea9c7e6fcd93d7f2704397b5bdb5cd8
+SHA1 (patch-au) = 0e9731f693f209d1c2bd4b28e71c03cab94020ea
diff --git a/multimedia/transcode/files/strip_fPIC.sh b/multimedia/transcode/files/strip_fPIC.sh
new file mode 100755
index 00000000000..007c94fb0a5
--- /dev/null
+++ b/multimedia/transcode/files/strip_fPIC.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# libtool assumes that the compiler can handle the -fPIC flag
+# This isn't always true (for example, nasm can't handle it)
+command=""
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -?PIC)
+            # Ignore -fPIC and -DPIC options
+            ;;
+        *)
+            command="$command $1"
+            ;;
+    esac
+    shift
+done
+echo $command
+exec $command
diff --git a/multimedia/transcode/patches/patch-at b/multimedia/transcode/patches/patch-at
new file mode 100644
index 00000000000..89ca3d9e45b
--- /dev/null
+++ b/multimedia/transcode/patches/patch-at
@@ -0,0 +1,33 @@
+$NetBSD: patch-at,v 1.1 2004/05/12 16:19:32 drochner Exp $
+
+--- bbmpeg/Makefile.am.orig	2003-09-15 16:30:20.000000000 +0200
++++ bbmpeg/Makefile.am	2004-05-12 18:38:26.000000000 +0200
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = 1.3 foreign
+ DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I. 
+ 
+-noinst_LIBRARIES = libbbmpeg.a
++noinst_LTLIBRARIES = libbbmpeg.la
+ 
+ if HAVE_ASM_NASM
+ BB_SRC2 = fdct_mmx.s idct_mmx.s quant_mmx.s motion_mmx.s variance_mmx.s
+@@ -20,7 +20,7 @@
+ 
+ CFLAGS = -funroll-loops -ffast-math @CFLAGS@ $(MMX)
+ 
+-libbbmpeg_a_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
++libbbmpeg_la_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
+ 
+ noinst_HEADERS = mtable.h mplex.h mmx.h main.h imgresample.h gmo_read.h encaudio.h consts.h consts1.h common.h bbencode.h 
+ 
+@@ -60,7 +60,9 @@
+ ASM = @NASM@
+ ASMFLAGS = @NASMFLAGS@
+ 
+-%.o: %.s ;	$(ASM) -g $(ASMFLAGS) -o $@ $<
++STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
++
++%.lo: %.s ;	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(ASM) $(ASMFLAGS) -o $@ $<
+ 
+ 
+ 
diff --git a/multimedia/transcode/patches/patch-au b/multimedia/transcode/patches/patch-au
new file mode 100644
index 00000000000..edf7804d0d0
--- /dev/null
+++ b/multimedia/transcode/patches/patch-au
@@ -0,0 +1,31 @@
+$NetBSD: patch-au,v 1.1 2004/05/12 16:19:32 drochner Exp $
+
+--- aclib/Makefile.am.orig	2003-09-15 16:30:20.000000000 +0200
++++ aclib/Makefile.am	2004-05-12 18:27:06.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.3 foreign
+ 
+-noinst_LIBRARIES = libac.a
++noinst_LTLIBRARIES = libac.la
+ 
+ if HAVE_ASM_NASM
+ ASM_SRC = memcpy.s rescale.s average.s swap.s asm_io.s
+@@ -10,7 +10,7 @@
+ 
+ CFLAGS = -funroll-loops -ffast-math -DLINUX @CFLAGS@
+ 
+-libac_a_SOURCES = cputest.c $(ASM_SRC)
++libac_la_SOURCES = cputest.c $(ASM_SRC)
+ 
+ EXTRA_DIST = \
+   ac.h \
+@@ -26,5 +26,7 @@
+ ASM = @NASM@
+ ASMFLAGS = @NASMFLAGS@ -g
+ 
+-%.o: %.s ;	$(ASM) $(ASMFLAGS) -o $@ $<
++STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
++
++%.lo: %.s ;	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(ASM) $(ASMFLAGS) -o $@ $<
+