pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/xmms-faad Share patches with audio/faad2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/3dd054f7dcdc
branches: trunk
changeset: 517192:3dd054f7dcdc
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Aug 06 10:39:01 2006 +0000
description:
Share patches with audio/faad2.
diffstat:
audio/xmms-faad/Makefile | 19 +++++++------------
audio/xmms-faad/distinfo | 9 ---------
audio/xmms-faad/patches/patch-aa | 16 ----------------
audio/xmms-faad/patches/patch-ab | 14 --------------
audio/xmms-faad/patches/patch-ac | 17 -----------------
audio/xmms-faad/patches/patch-ad | 15 ---------------
6 files changed, 7 insertions(+), 83 deletions(-)
diffs (140 lines):
diff -r bfdd20989313 -r 3dd054f7dcdc audio/xmms-faad/Makefile
--- a/audio/xmms-faad/Makefile Sun Aug 06 10:38:42 2006 +0000
+++ b/audio/xmms-faad/Makefile Sun Aug 06 10:39:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/08/06 10:39:01 wiz Exp $
DISTNAME= faad2-2.0
PKGNAME= xmms-faad-2.0
@@ -15,18 +15,21 @@
#NO_BIN_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}/faad2
-USE_TOOLS+= automake14 gmake pkg-config
+USE_TOOLS+= automake gmake pkg-config
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= # empty
+DISTINFO_FILE= ${.CURDIR}/../../audio/faad2/distinfo
+PATCHDIR= ${.CURDIR}/../../audio/faad2/patches
+
AUTOCONF_REQD= 2.50
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-xmms
CONFIGURE_ARGS+= --with-mp4v2
-
-.include "../../mk/bsd.prefs.mk"
+BUILD_DIRS= plugins/xmms/src
+INSTALL_DIRS= plugins/xmms
pre-configure:
@${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend
@@ -39,14 +42,6 @@
autoconf; \
done
-do-build:
- @cd ${WRKSRC}/plugins/xmms/src && \
- ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_TARGET}
-
-do-install:
- @cd ${WRKSRC}/plugins/xmms && \
- ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
-
.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/id3lib/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
diff -r bfdd20989313 -r 3dd054f7dcdc audio/xmms-faad/distinfo
--- a/audio/xmms-faad/distinfo Sun Aug 06 10:38:42 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/12/07 18:09:04 joerg Exp $
-
-SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
-RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90
-Size (faad2-2.0.tar.gz) = 766660 bytes
-SHA1 (patch-aa) = 85f739511bc3c1dd8776f775dd94b1b9f9f25351
-SHA1 (patch-ab) = a049439c9aaf2f3a7bf0bfabe0c9a7b2cdd23b4f
-SHA1 (patch-ac) = 0eea09b484217e5b763b2e9ce012414dc77c95df
-SHA1 (patch-ad) = f90050ba166e5a7eac7b0db5e9360eecab59dba7
diff -r bfdd20989313 -r 3dd054f7dcdc audio/xmms-faad/patches/patch-aa
--- a/audio/xmms-faad/patches/patch-aa Sun Aug 06 10:38:42 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/05/21 03:16:23 grant Exp $
-
---- libfaad/Makefile.am.orig 2004-02-06 13:12:28.000000000 +0000
-+++ libfaad/Makefile.am
-@@ -7,8 +7,9 @@
- pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \
- rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \
- sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \
--sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c \
--analysis.h bits.h cfft.h cfft_tab.h common.h \
-+sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c
-+
-+libfaad_la_INCLUDES = analysis.h bits.h cfft.h cfft_tab.h common.h \
- decoder.h drc.h error.h fixed.h filtbank.h \
- huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h mdct.h mp4.h \
- ms.h output.h pns.h pulse.h rvlc.h sine_win.h ssr.h ssr_fb.h ssr_ipqf.h \
diff -r bfdd20989313 -r 3dd054f7dcdc audio/xmms-faad/patches/patch-ab
--- a/audio/xmms-faad/patches/patch-ab Sun Aug 06 10:38:42 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/05/21 03:16:23 grant Exp $
-
---- frontend/Makefile.am.orig 2003-11-06 11:04:13.000000000 +0000
-+++ frontend/Makefile.am
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = faad
-
--faad_SOURCES = main.c audio.c $(top_srcdir)/common/faad/getopt.c \
-- audio.h
-+faad_SOURCES = main.c audio.c getopt.c
-+faad_INCLUDES = audio.h
-
- AM_CFLAGS = -O2
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
diff -r bfdd20989313 -r 3dd054f7dcdc audio/xmms-faad/patches/patch-ac
--- a/audio/xmms-faad/patches/patch-ac Sun Aug 06 10:38:42 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/12/07 18:09:04 joerg Exp $
-
---- plugins/xmms/src/Makefile.am.orig 2004-02-07 03:05:07.000000000 +1100
-+++ plugins/xmms/src/Makefile.am
-@@ -5,9 +5,9 @@ libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cfl
- `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
- -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
-
--libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
-- $(top_builddir)/common/mp4v2/libmp4v2.la
-+LIBS = -lfaad -lmp4v2
-+CFLAGS = `$(XMMS_CONFIG) --cflags` `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1
-
- libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
-- `$(GTK_CONFIG) --libs` -lpthread -lstdc++
-+ `$(GTK_CONFIG) --libs` -lstdc++ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
diff -r bfdd20989313 -r 3dd054f7dcdc audio/xmms-faad/patches/patch-ad
--- a/audio/xmms-faad/patches/patch-ad Sun Aug 06 10:38:42 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/05/21 03:16:23 grant Exp $
-
---- plugins/xmms/src/libmp4.c.orig 2003-12-04 05:37:56.000000000 +1100
-+++ plugins/xmms/src/libmp4.c
-@@ -8,8 +8,8 @@
-
- #include <pthread.h>
- #include <gtk/gtk.h>
--#include "faad.h"
--#include "mp4.h"
-+#include <faad.h>
-+#include <mp4.h>
-
- #include <xmms/plugin.h>
- #include <xmms/util.h>
Home |
Main Index |
Thread Index |
Old Index