Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Dec 2010 19:29:05 +0900
From:      Takefu <takefu@airport.fm>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/153518: [PATCH] audio/libaacplus: update to 2.0.2
Message-ID:  <4D1B0D71.1090502@airport.fm>
Resent-Message-ID: <201012291030.oBTAUAPN026777@freefall.freebsd.org>
In-Reply-To: <201012290840.oBT8eVlE086714@unbound.local.ae-osaka.co.jp>
References:  <201012290840.oBT8eVlE086714@unbound.local.ae-osaka.co.jp>

next in thread | previous in thread | raw e-mail | index | archive | help

>Number:         153518
>Category:       ports
>Synopsis:       [PATCH] audio/libaacplus: update to 2.0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 29 10:30:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Takefu
>Release:        FreeBSD 8.2-RC1 amd64
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:

- Update to 2.0.2

>How-To-Repeat:
>Fix:

--- libaacplus-2.0.2.patch begins here ---
diff -ruN /usr/ports/audio/libaacplus/Makefile audio/libaacplus/Makefile
--- /usr/ports/audio/libaacplus/Makefile	2010-12-06 08:30:47.000000000 +0900
+++ audio/libaacplus/Makefile	2010-12-29 17:25:42.000000000 +0900
@@ -6,7 +6,7 @@
 #

 PORTNAME=	libaacplus
-PORTVERSION=	1.1.0
+PORTVERSION=	2.0.2
 CATEGORIES=	audio
 MASTER_SITES=	http://tipok.org.ua/downloads/media/aac+/libaacplus/:site1\
 		http://217.20.164.161/~tipok/aacplus/:site1\
@@ -23,10 +23,9 @@

 RESTRICTED=	unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies

-CONFLICTS=	aacplusenc-0*
+CONFLICTS=	aacplusenc-0* libaacplus-1*

 USE_GNOME=	pkgconfig
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool libtoolize aclocal autoheader automake
 GNU_CONFIGURE=	yes
@@ -52,6 +51,14 @@
 .endif

 pre-configure:
-	@${CP} ${DISTDIR}/26410-800.zip ${WRKSRC}
+	@${CP} ${DISTDIR}/26410-800.zip ${WRKSRC}/src
+
+post-patch:
+.if defined(WITH_OLDLIBS)
+	@${REINPLACE_CMD} -e 's,-I${includedir},-I@includedir@\ -I${includedir},'\
+	-e 's,@includedir@\/aacplus,@includedir@\/libaacplus,' ${WRKSRC}/aacplus.pc.in
+.else
+	@${REINPLACE_CMD} -e 's,\/aacplus,,' ${WRKSRC}/aacplus.pc.in
+.endif

 .include <bsd.port.mk>
diff -ruN /usr/ports/audio/libaacplus/distinfo audio/libaacplus/distinfo
--- /usr/ports/audio/libaacplus/distinfo	2010-11-01 08:27:06.000000000 +0900
+++ audio/libaacplus/distinfo	2010-12-15 07:52:12.000000000 +0900
@@ -1,4 +1,4 @@
-SHA256 (libaacplus-1.1.0.tar.gz) = 7ceb90d47d4de73193cd618be5e47870cc1732b8c9b51b32282ccfb47a5dc527
-SIZE (libaacplus-1.1.0.tar.gz) = 23900
+SHA256 (libaacplus-2.0.2.tar.gz) = 60dceb64d4ecf0be8d21661d5af2f214710f9d5b6ab389a5bdebf746baa7e1d7
+SIZE (libaacplus-2.0.2.tar.gz) = 42155
 SHA256 (26410-800.zip) = 4e7b3268b4e21a4dc2c88ee3af57c9115334d6b616a6e5f2e3f43643bf37b72f
 SIZE (26410-800.zip) = 1348294
diff -ruN /usr/ports/audio/libaacplus/files/patch-Makefile.am audio/libaacplus/files/patch-Makefile.am
--- /usr/ports/audio/libaacplus/files/patch-Makefile.am	2010-09-23 09:44:23.000000000 +0900
+++ audio/libaacplus/files/patch-Makefile.am	2010-10-15 07:48:58.000000000 +0900
@@ -1,11 +1,11 @@
---- Makefile.am.orig	2009-10-09 05:58:21.000000000 +0900
-+++ Makefile.am	2010-09-07 12:42:33.000000000 +0900
-@@ -14,7 +14,7 @@
- LDADD = @FFTW3_LDFLAGS@
-
+--- Makefile.am.orig	2010-10-07 21:00:14.000000000 +0900
++++ Makefile.am	2010-10-14 18:02:13.000000000 +0900
+@@ -2,7 +2,7 @@
+ SUBDIRS = src include patches frontend
+
  if HAVE_PKGCONFIG
-- pkgconfigdir = $(libdir)/pkgconfig
-+ pkgconfigdir = $(prefix)/libdata/pkgconfig
-  pkgconfig_DATA = aacplus.pc
+-    pkgconfigdir = $(libdir)/pkgconfig
++    pkgconfigdir = $(prefix)/libdata/pkgconfig
+     pkgconfig_DATA = aacplus.pc
  else
-  bin_SCRIPTS = aacplus-config
+     bin_SCRIPTS = aacplus-config
diff -ruN /usr/ports/audio/libaacplus/files/patch-aacplus.pc.in audio/libaacplus/files/patch-aacplus.pc.in
--- /usr/ports/audio/libaacplus/files/patch-aacplus.pc.in	2010-10-30 21:47:25.000000000 +0900
+++ audio/libaacplus/files/patch-aacplus.pc.in	1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
---- aacplus.pc.in.orig	2009-03-22 22:16:54.000000000 +0900
-+++ aacplus.pc.in	2010-10-19 15:55:40.000000000 +0900
-@@ -1,10 +1,8 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@/aacplus
-+includedir=@includedir@/libaacplus
- toolsdir=${exec_prefix}/bin
--cppflags=@AACPLUS_CPPFLAGS@
--cflags_only=@AACPLUS_CFLAGS@
-
-
- Name: aacplus
diff -ruN /usr/ports/audio/libaacplus/pkg-plist audio/libaacplus/pkg-plist
--- /usr/ports/audio/libaacplus/pkg-plist	2010-09-23 09:44:22.000000000 +0900
+++ audio/libaacplus/pkg-plist	2010-12-29 14:15:53.000000000 +0900
@@ -1,68 +1,7 @@
 bin/aacplusenc
-include/libaacplus/FFR_bitbuffer.h
-include/libaacplus/FloatFR.h
-include/libaacplus/aac_ram.h
-include/libaacplus/aac_rom.h
-include/libaacplus/aacenc.h
-include/libaacplus/adj_thr.h
-include/libaacplus/adj_thr_data.h
-include/libaacplus/adts.h
-include/libaacplus/band_nrg.h
-include/libaacplus/bit_cnt.h
-include/libaacplus/bit_sbr.h
-include/libaacplus/bitenc.h
-include/libaacplus/block_switch.h
-include/libaacplus/cfftn.h
-include/libaacplus/channel_map.h
-include/libaacplus/cmondata.h
-include/libaacplus/code_env.h
-include/libaacplus/counters.h
-include/libaacplus/dyn_bits.h
-include/libaacplus/env_bit.h
-include/libaacplus/env_est.h
-include/libaacplus/fram_gen.h
-include/libaacplus/freq_sca.h
-include/libaacplus/grp_data.h
-include/libaacplus/hybrid.h
-include/libaacplus/iir32resample.h
-include/libaacplus/interface.h
-include/libaacplus/invf_est.h
-include/libaacplus/line_pe.h
-include/libaacplus/mh_det.h
-include/libaacplus/minmax.h
-include/libaacplus/ms_stereo.h
-include/libaacplus/nf_est.h
-include/libaacplus/pre_echo_control.h
-include/libaacplus/ps_bitenc.h
-include/libaacplus/ps_enc.h
-include/libaacplus/psy_configuration.h
-include/libaacplus/psy_const.h
-include/libaacplus/psy_data.h
-include/libaacplus/psy_main.h
-include/libaacplus/qc_data.h
-include/libaacplus/qc_main.h
-include/libaacplus/qmf_enc.h
-include/libaacplus/quantize.h
-include/libaacplus/resampler.h
-include/libaacplus/sbr.h
-include/libaacplus/sbr_def.h
-include/libaacplus/sbr_main.h
-include/libaacplus/sbr_misc.h
-include/libaacplus/sbr_ram.h
-include/libaacplus/sbr_rom.h
-include/libaacplus/sf_estim.h
-include/libaacplus/spreading.h
-include/libaacplus/stat_bits.h
-include/libaacplus/stprepro.h
-include/libaacplus/tns.h
-include/libaacplus/tns_func.h
-include/libaacplus/tns_param.h
-include/libaacplus/ton_corr.h
-include/libaacplus/tran_det.h
-include/libaacplus/transform.h
+include/aacplus.h
 lib/libaacplus.a
 lib/libaacplus.la
 lib/libaacplus.so
-lib/libaacplus.so.1
+lib/libaacplus.so.2
 libdata/pkgconfig/aacplus.pc
-@dirrmtry include/libaacplus
--- libaacplus-2.0.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



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