Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Mar 2014 16:32:22 +0100
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        Jakub Lach <jakub_lach@mailplus.pl>
Cc:        freebsd-multimedia@freebsd.org
Subject:   Re: gstreamer1-libav, vimeo (h.264) and firefox 28
Message-ID:  <20140324163222.4661f934@kalimero.tijl.coosemans.org>
In-Reply-To: <1395613710740-5897020.post@n5.nabble.com>
References:  <20140322150342.61c96ded@kalimero.tijl.coosemans.org> <1395499298157-5896573.post@n5.nabble.com> <20140322173619.589f7b37@kalimero.tijl.coosemans.org> <1395510303597-5896619.post@n5.nabble.com> <1395518825561-5896654.post@n5.nabble.com> <1395531379489-5896720.post@n5.nabble.com> <20140323130150.7620fda6@kalimero.tijl.coosemans.org> <1395576400495-5896833.post@n5.nabble.com> <1395609602885-5897007.post@n5.nabble.com> <1395610319821-5897010.post@n5.nabble.com> <1395613710740-5897020.post@n5.nabble.com>

next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/8ejGl+09O5wx+u5uJFjW9Ve
Content-Type: multipart/mixed; boundary="MP_/sjEE0LPwYJJt3jLKGmmNZau"

--MP_/sjEE0LPwYJJt3jLKGmmNZau
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

On Sun, 23 Mar 2014 15:28:30 -0700 (PDT) Jakub Lach wrote:
> But patches there are malformed/for older libav and it's really testing my
> patience.

Can you try the attached patch?

--MP_/sjEE0LPwYJJt3jLKGmmNZau
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=gstreamer1-libav.patch

Index: multimedia/gstreamer1-libav/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- multimedia/gstreamer1-libav/Makefile	(revision 348923)
+++ multimedia/gstreamer1-libav/Makefile	(working copy)
@@ -4,6 +4,7 @@
=20
 PORTNAME=3D	gstreamer1-libav
 PORTVERSION=3D	1.2.2
+PORTREVISION=3D	1
 CATEGORIES=3D	multimedia
 MASTER_SITES=3D	http://gstreamer.freedesktop.org/src/gst-libav/
 DISTNAME=3D	gst-libav-${PORTVERSION}
@@ -17,11 +18,10 @@ BUILD_DEPENDS=3D	yasm:${PORTSDIR}/devel/ya
 		orc>=3D0.4.16:${PORTSDIR}/devel/orc
 LIB_DEPENDS=3D	liborc-0.4.so:${PORTSDIR}/devel/orc
=20
-USE_XZ=3D		yes
+USES=3D		compiler:features gmake pkgconfig tar:xz
 USE_LDCONFIG=3D	yes
 USE_GSTREAMER1=3D	yes
 GNU_CONFIGURE=3D	yes
-USES=3D		compiler:features gmake pkgconfig
 LIBAV_CONFIG=3D	--cc=3D${CC} \
 		--enable-runtime-cpudetect \
 		--enable-pic
@@ -29,24 +29,6 @@ LDFLAGS+=3D	-Wl,-Bsymbolic
=20
 PLIST_SUB=3D	VERSION=3D"1.0"
=20
-# sse hardware vector support
-.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} =3D=3D "sse" || ${MACHINE=
_CPU:Mamd64} =3D=3D "amd64")
-WITH_BUILTIN_VECTOR=3D	yes
-.else
-LIBAV_CONFIG+=3D	--disable-sse
-.endif
-
-# mmx support
-.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} =3D=3D "" && ${MACHINE_CPU=
:Mamd64} =3D=3D ""
-LIBAV_CONFIG+=3D	--disable-mmx
-WITHOUT_BUILTIN_VECTOR=3D	yes
-.endif
-
-# builtin vector, requires mmx and sse
-.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
-CFLAGS+=3D		-msse
-.endif
-
 CONFIGURE_ARGS+=3D	--with-libav-extra-configure=3D"${LIBAV_CONFIG}"
=20
 .include <bsd.port.pre.mk>
@@ -56,14 +38,18 @@ BUILD_DEPENDS+=3D	${LOCALBASE}/bin/as:${PO
 MAKE_ENV=3D	COMPILER_PATH=3D${LOCALBASE}/bin
 .endif
=20
-.if ${ARCH} =3D=3D powerpc64
-FFMPEG_CONFIG+=3D	--arch=3Dppc64
-.endif
-=20
 .if ${COMPILER_TYPE} =3D=3D "gcc"
 CFLAGS+=3D	-fno-force-addr
 .endif
=20
+post-patch:
+	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \
+		${WRKSRC}/gst-libs/ext/libav/Makefile \
+		${WRKSRC}/gst-libs/ext/libav/common.mak \
+		${WRKSRC}/gst-libs/ext/libav/configure \
+		${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \
+		${WRKSRC}/gst-libs/ext/libav/library.mak
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0/libgstlibav.so
=20

--MP_/sjEE0LPwYJJt3jLKGmmNZau--

--Sig_/8ejGl+09O5wx+u5uJFjW9Ve
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)

iF4EAREKAAYFAlMwUAsACgkQfoCS2CCgtitjmQD/a0H0QVkOXZ6eHOXMLO8eXjB1
bDLr+BCCsde6Mw7PxC0A/R5aWusASX9hOVE2DrXaq43BXa2imxWpcOKCg52ikTDc
=eTal
-----END PGP SIGNATURE-----

--Sig_/8ejGl+09O5wx+u5uJFjW9Ve--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140324163222.4661f934>