From 61dadab415b7e41e9a5323fb65155843a2f16114 Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Mon, 24 May 2010 22:10:02 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 multimedia/ffmpeg/Makefile.common 	multimedia/ffmpeg/distinfo 
 multimedia/ffmpeg/patches/patch-ae

---
 multimedia/ffmpeg/Makefile.common  | 80 ++++++++++++++++++++++++++++++
 multimedia/ffmpeg/distinfo         | 13 +++++
 multimedia/ffmpeg/patches/patch-ae | 25 ++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 multimedia/ffmpeg/Makefile.common
 create mode 100644 multimedia/ffmpeg/distinfo
 create mode 100644 multimedia/ffmpeg/patches/patch-ae

diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common
new file mode 100644
index 000000000000..40dab27c7f56
--- /dev/null
+++ b/multimedia/ffmpeg/Makefile.common
@@ -0,0 +1,80 @@
+# $NetBSD: Makefile.common,v 1.5 2010/03/14 23:07:30 tron Exp $
+# used by multimedia/ffplay/Makefile
+
+DISTNAME=	ffmpeg-${DISTVERSION:S/-//g}
+CATEGORIES=	multimedia
+MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/ahoka/dist/ \
+		http://irkmaffia.com/~ahoka/distfiles/
+EXTRACT_SUFX=	.tar.bz2
+
+DISTVERSION=	2009-06-11
+PREV_PKGPATH=	multimedia/ffmpeg-devel
+WRKSRC=		${WRKDIR}/ffmpeg-export-${DISTVERSION}
+PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg/patches
+
+HAS_CONFIGURE=	YES
+USE_LANGUAGES+=	c99
+USE_LIBTOOL=	YES
+USE_TOOLS+=	gmake texi2html pod2man
+
+.include "../../mk/compiler.mk"
+
+.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
+SUBST_CLASSES+=		sunwspro
+SUBST_MESSAGE.sunwspro=	Fixing compiler options for SunStudio C compiler.
+SUBST_STAGE.sunwspro=	post-configure
+SUBST_FILES.sunwspro=	config.mak
+SUBST_SED.sunwspro=	-e "s/-O /-KPIC -DPIC /"
+SUBST_SED.sunwspro+=	-e "s/-O3/-xO2/g"
+SUBST_SED.sunwspro+=	-e "s/-std=c99/-xc99=all/"
+SUBST_SED.sunwspro+=	-e "s/-Wl,-rpath-link,/-L /g"
+.endif
+
+BUILD_DEPENDS+=	yasm>=0.7.2:../../devel/yasm
+
+REPLACE_PERL+=	doc/texi2pod.pl
+REPLACE_SH+=	configure version.sh
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	post-patch
+SUBST_FILES.conf=	ffserver.c
+SUBST_SED.conf=		-e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
+SUBST_MESSAGE.conf=	Fixing configuration path.
+
+PLIST_SRC+=	${PKGDIR}/PLIST
+
+MAKE_ENV+=	EXTRA_LIBS=${LIBGETOPT:Q}
+# LOCALBASE=${LOCALBASE:Q}
+
+# Let's not put garbage into /tmp
+CONFIGURE_ENV+=		TMPDIR=${WRKSRC:Q}/tmp
+
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR} \
+			--cc=${CC:Q} \
+			--prefix=${PREFIX:Q} \
+			--disable-debug \
+			--disable-stripping \
+			--enable-shared \
+			--enable-pthreads \
+			--enable-gpl
+
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--disable-amd3dnow --disable-amd3dnowext
+CONFIGURE_ARGS+=	--disable-mmx --disable-mmx2
+CONFIGURE_ARGS+=	--disable-sse --disable-ssse3
+.else
+CONFIGURE_ARGS+=	--enable-runtime-cpudetect
+.endif
+
+# No posix_memalign() in NetBSD 4.0 and earlier
+#
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
+CONFIGURE_ARGS+=	--enable-memalign-hack
+.endif
+
+pre-configure:
+	mkdir ${WRKSRC}/tmp
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
new file mode 100644
index 000000000000..f06f4e4737ec
--- /dev/null
+++ b/multimedia/ffmpeg/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.35 2010/05/04 18:33:43 drochner Exp $
+
+SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
+RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
+Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
+SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
+SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7
+SHA1 (patch-ac) = 05820de2ae81b4607ba782b0233fd1e087045b97
+SHA1 (patch-ad) = ebee8a9e3d5caa533459e1547690ee6c2f095018
+SHA1 (patch-ae) = ae9d686450fb6fa1161bb2844282bf530148e368
+SHA1 (patch-af) = 2507866ddc72c7e8ff10b489c86cb679e8e2fd49
+SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b
+SHA1 (patch-configure) = 2676c15b2fccdf4cde817f6f143885b3faea2467
diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
new file mode 100644
index 000000000000..bbc270086000
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.10 2010/03/14 23:07:30 tron Exp $
+
+Really turn AMD 3DNow (and MMX, etc.) because the shared library
+will otherwise not build (Mac OS X) or work (Solaris) on Intel CPUs.
+
+--- libswscale/rgb2rgb.c.orig	Thu Mar 19 04:45:29 2009
++++ libswscale/rgb2rgb.c	Sun Mar 14 23:55:39 2010
+@@ -101,7 +101,7 @@
+                                       long lumStride, long chromStride, long srcStride);
+ 
+ 
+-#if ARCH_X86 && CONFIG_GPL
++#if ARCH_X86 && CONFIG_GPL && !defined(sun)
+ DECLARE_ASM_CONST(8, uint64_t, mmx_null)     = 0x0000000000000000ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mmx_one)      = 0xFFFFFFFFFFFFFFFFULL;
+ DECLARE_ASM_CONST(8, uint64_t, mask32b)      = 0x000000FF000000FFULL;
+@@ -162,7 +162,7 @@
+ #define RENAME(a) a ## _C
+ #include "rgb2rgb_template.c"
+ 
+-#if ARCH_X86 && CONFIG_GPL
++#if ARCH_X86 && CONFIG_GPL && !defined(sun) && !defined(__APPLE__)
+ 
+ //MMX versions
+ #undef RENAME
-- 
2.41.0