aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2004-11-12 03:17:42 +0000
committerMichael Johnson <ahze@FreeBSD.org>2004-11-12 03:17:42 +0000
commit92a413daa862ed4018e0352a6fe61bd594a94879 (patch)
treeadcb519a2ec9a4be39a462a2cf75af519c9090cd /audio
parent1ec5e3c20fe760a04e2ebafe9cefa4f0c5086604 (diff)
downloadports-92a413daa862ed4018e0352a6fe61bd594a94879.tar.gz
ports-92a413daa862ed4018e0352a6fe61bd594a94879.zip
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/bmp-faad/Makefile11
-rw-r--r--audio/bmp-faad/files/patch-xmms-Makefile.am12
2 files changed, 9 insertions, 14 deletions
diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile
index 74e519dc34ed..94b0d056b35c 100644
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@@ -41,6 +41,9 @@ DESCR= ${PORTSDIR}/audio/faad/pkg-descr
MD5_FILE= ${PORTSDIR}/audio/faad/distinfo
PLIST_FILES= lib/bmp/Input/libmp4.so
+BUILD_WRKSRC= ${WRKSRC}/plugins/xmms/src
+INSTALL_WRKSRC= ${WRKSRC}/plugins/xmms/src
+
.include <bsd.port.pre.mk>
pre-patch: build-depends
@@ -60,12 +63,4 @@ post-patch:
's|-O2|${CFLAGS}|'
@${REINPLACE_CMD} -e 's|<xmms|<bmp|' ${WRKSRC}/plugins/xmms/src/libmp4.c
-do-build:
- @cd ${WRKSRC}/libfaad && ${MAKE}
- @cd ${WRKSRC}/common/mp4v2 && ${MAKE}
- @cd ${WRKSRC}/plugins/xmms/src && ${MAKE}
-
-do-install:
- @cd ${WRKSRC}/plugins/xmms/src && ${MAKE} install
-
.include <bsd.port.post.mk>
diff --git a/audio/bmp-faad/files/patch-xmms-Makefile.am b/audio/bmp-faad/files/patch-xmms-Makefile.am
index 8fc045eb0f16..90d441aade79 100644
--- a/audio/bmp-faad/files/patch-xmms-Makefile.am
+++ b/audio/bmp-faad/files/patch-xmms-Makefile.am
@@ -1,6 +1,6 @@
--- plugins/xmms/src/Makefile.am.orig Fri Feb 6 11:05:07 2004
-+++ plugins/xmms/src/Makefile.am Thu Sep 2 13:36:46 2004
-@@ -1,13 +1,13 @@
++++ plugins/xmms/src/Makefile.am Thu Nov 11 18:56:18 2004
+@@ -1,13 +1,10 @@
-libdir = `$(XMMS_CONFIG) --input-plugin-dir`
+libdir = `pkg-config --variable=input_plugin_dir bmp`
lib_LTLIBRARIES = libmp4.la
@@ -11,11 +11,11 @@
+ `pkg-config bmp --cflags` \
-I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
- libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
- $(top_builddir)/common/mp4v2/libmp4v2.la
-
+-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+- $(top_builddir)/common/mp4v2/libmp4v2.la
+-
-libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
- `$(GTK_CONFIG) --libs` -lpthread -lstdc++
+libmp4_la_LDFLAGS = -module -avoid-version `pkg-config bmp --libs` \
-+ `pkg-config gtk+-2.0 --libs` -lpthread -lstdc++
++ `pkg-config gtk+-2.0 --libs` -lpthread -lstdc++ -lfaad -lmp4v2
libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c