On 28/01/12 3:20 AM, Alexandr Shadchin wrote:
On Wed, Dec 21, 2011 at 01:00:31AM +0600, Alexandr Shadchin wrote:
Hi,
Remove audio/faad from LIB_DEPENDS, streamripper not use this library.
(ripaac.o is empty)
Comments ? OK ?
No objection ?
Does this not build Ok without the additional patches?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/streamripper/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 1 Dec 2011 18:57:48 -0000 1.22
+++ Makefile 20 Dec 2011 18:47:22 -0000
@@ -3,6 +3,7 @@
COMMENT= rip shoutcast streams to local mp3s
DISTNAME= streamripper-1.64.6
+REVISION= 0
CATEGORIES= audio
HOMEPAGE= http://streamripper.sourceforge.net/
@@ -17,16 +18,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += c faad glib-2.0 iberty m mad>=2 ogg>=5.2 pthread vorbis>=3.0
+WANTLIB += c glib-2.0 iberty m mad>=2 ogg>=5.2 pthread vorbis>=3.0
-LIB_DEPENDS= audio/faad \
- audio/libmad \
+LIB_DEPENDS= audio/libmad \
audio/libogg \
audio/libvorbis \
devel/glib2
AUTOCONF_VERSION=2.63
CONFIGURE_STYLE= autoconf
+CONFIGURE_ARGS += ac_cv_lib_faad_NeAACDecDecode2=no
CONFIGURE_ENV= CPPLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GROFF = Yes
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 20 Dec 2011 18:47:22 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- Makefile.in.orig Sun Dec 18 16:12:17 2011
++++ Makefile.in Sun Dec 18 16:12:34 2011
+@@ -554,7 +554,6 @@ lib_manifest = \
+ lib/relaylib.h \
+ lib/rip_manager.c \
+ lib/rip_manager.h \
+- lib/ripaac.c \
+ lib/ripogg.c \
+ lib/ripogg.h \
+ lib/ripstream.c \
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: patches/patch-lib_Makefile_in
diff -N patches/patch-lib_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Makefile_in 20 Dec 2011 18:47:22 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- lib/Makefile.in.orig Sun Dec 18 16:12:49 2011
++++ lib/Makefile.in Sun Dec 18 16:13:17 2011
+@@ -60,7 +60,7 @@ am_libstreamripper_a_OBJECTS = cbuf2.$(OBJEXT) charset
+ filelib.$(OBJEXT) findsep.$(OBJEXT) findsep2.$(OBJEXT) \
+ http.$(OBJEXT) iconvert.$(OBJEXT) mchar.$(OBJEXT) \
+ parse.$(OBJEXT) prefs.$(OBJEXT) relaylib.$(OBJEXT) \
+- rip_manager.$(OBJEXT) ripaac.$(OBJEXT) ripogg.$(OBJEXT) \
++ rip_manager.$(OBJEXT) ripogg.$(OBJEXT) \
+ ripstream.$(OBJEXT) socklib.$(OBJEXT) threadlib.$(OBJEXT) \
+ utf8.$(OBJEXT)
+ libstreamripper_a_OBJECTS = $(am_libstreamripper_a_OBJECTS)
+@@ -216,7 +216,6 @@ libstreamripper_a_SOURCES = \
+ prefs.c \
+ relaylib.c \
+ rip_manager.c \
+- ripaac.c \
+ ripogg.c \
+ ripstream.c \
+ socklib.c \
+@@ -327,7 +326,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relaylib.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rip_manager.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ripaac.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ripogg.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ripstream.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socklib.Po@am__quote@
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
