Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Aug 2012 14:32:04 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302240 - in head/multimedia: gstreamer-plugins gstreamer-plugins-ugly/files
Message-ID:  <201208071432.q77EW4dC071404@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Tue Aug  7 14:32:04 2012
New Revision: 302240
URL: http://svn.freebsd.org/changeset/ports/302240

Log:
  Fix the build of the amrnb and amrwb plugins after the opencore update to 0.1.3.
  
  Submitted by:	pointyhat via beat
  Obtained from:	Gstreamer upstream

Added:
  head/multimedia/gstreamer-plugins-ugly/files/
  head/multimedia/gstreamer-plugins-ugly/files/patch-ext-amr   (contents, props changed)
Modified:
  head/multimedia/gstreamer-plugins/Makefile.common

Added: head/multimedia/gstreamer-plugins-ugly/files/patch-ext-amr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gstreamer-plugins-ugly/files/patch-ext-amr	Tue Aug  7 14:32:04 2012	(r302240)
@@ -0,0 +1,40 @@
+--- ext/amrnb/amrnbdec.h.orig	2011-12-30 18:40:45.000000000 +0100
++++ ext/amrnb/amrnbdec.h	2012-08-07 16:21:06.000000000 +0200
+@@ -22,7 +22,8 @@
+ 
+ #include <gst/gst.h>
+ #include <gst/audio/gstaudiodecoder.h>
+-#include <interf_dec.h>
++
++#include <opencore-amrnb/interf_dec.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- ext/amrnb/amrnbenc.h.orig	2011-12-30 18:40:45.000000000 +0100
++++ ext/amrnb/amrnbenc.h	2012-08-07 16:19:26.000000000 +0200
+@@ -21,9 +21,10 @@
+ #define __GST_AMRNBENC_H__
+ 
+ #include <gst/gst.h>
+-#include <interf_enc.h>
+ #include <gst/audio/gstaudioencoder.h>
+ 
++#include <opencore-amrnb/interf_enc.h>
++
+ G_BEGIN_DECLS
+ 
+ #define GST_TYPE_AMRNBENC \
+--- ext/amrwbdec/amrwbdec.h.orig	2011-12-30 18:40:45.000000000 +0100
++++ ext/amrwbdec/amrwbdec.h	2012-08-07 16:19:05.000000000 +0200
+@@ -22,8 +22,9 @@
+ 
+ #include <gst/gst.h>
+ #include <gst/audio/gstaudiodecoder.h>
+-#include <dec_if.h>
+-#include <if_rom.h>
++
++#include <opencore-amrwb/dec_if.h>
++#include <opencore-amrwb/if_rom.h>
+ 
+ G_BEGIN_DECLS
+ 

Modified: head/multimedia/gstreamer-plugins/Makefile.common
==============================================================================
--- head/multimedia/gstreamer-plugins/Makefile.common	Tue Aug  7 14:29:25 2012	(r302239)
+++ head/multimedia/gstreamer-plugins/Makefile.common	Tue Aug  7 14:32:04 2012	(r302240)
@@ -180,6 +180,7 @@ gst_aalib_PLIST_FILES=	${GST_LIB_DIR}/li
 		${GST_LIB_DIR}/libgstaasink.la
 
 # amrnb
+gst_amrnb_BUILD_DEPENDS+=opencore-amr>=0.1.3:${PORTSDIR}/audio/opencore.amr
 gst_amrnb_LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
 gst_amrnb_PLIST_FILES=	${GST_LIB_DIR}/libgstamrnb.la \
 			${GST_LIB_DIR}/libgstamrnb.so \
@@ -189,6 +190,7 @@ gst_amrnb_PLIST_DIRSTRY=share/gstreamer-
 gst_amrnb_DIST=		ugly
 
 # amrwbdec
+gst_amrwbdec_BUILD_DEPENDS+=	opencore-amr>=0.1.3:${PORTSDIR}/audio/opencore.amr
 gst_amrwbdec_LIB_DEPENDS+=	opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
 gst_amrwbdec_CONFIGURE_ARGS+=	--enable-amrwb
 gst_amrwbdec_PLIST_FILES=	${GST_LIB_DIR}/libgstamrwbdec.la \



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