[csw-devel] SF.net SVN: gar:[10619] csw/mgar/pkg/libfaad2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 10619
          http://gar.svn.sourceforge.net/gar/?rev=10619&view=rev
Author:   dmichelsen
Date:     2010-07-28 10:32:50 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
libfaad2: Some more fixed, now only .so.0 is missing

Modified Paths:
--------------
    csw/mgar/pkg/libfaad2/trunk/Makefile
    csw/mgar/pkg/libfaad2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch

Modified: csw/mgar/pkg/libfaad2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/Makefile	2010-07-28 08:59:54 UTC (rev 10618)
+++ csw/mgar/pkg/libfaad2/trunk/Makefile	2010-07-28 10:32:50 UTC (rev 10619)
@@ -14,24 +14,45 @@
 PATCHFILES  = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch
 PATCHFILES += 0002-Use-inline-suitable-for-SS.patch
 PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch
+PATCHFILES += 0004-Remove-Wall-from-xmms-plugin.patch
 
-PACKAGES = CSWfaad2
-CATALOGNAME = faad2
-
-SPKG_SOURCEURL = http://www.audiocoding.com/
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2
 
-# TBD:
-# DEP_PKGS = CSWmpeg4ip
+PACKAGES = CSWfaad2 CSWxmmsfaad2
+CATALOGNAME_CSWfaad2 = faad2
+CATALOGNAME_CSWxmmsfaad2 = xmms_faad2
 
+SPKG_DESC_CSWfaad2 = $(DESCRIPTION)
+SPKG_DESC_CSWxmmsfaad2 = AAC plugin for XMMS
+
+BUILD_DEP_PKGS = CSWxmms
+RUNTIME_DEP_PKGS_CSWfaad2 = 
+RUNTIME_DEP_PKGS_CSWxmmsfaad2 = CSWxmms CSWglib CSWgtk
+
+VENDOR_URL = http://www.audiocoding.com/faad2.html
+
+STRIP_LIBTOOL = 1
+
 BUILD64 = 1
 NOISAEXEC = 1
+
+CONFIGURE_ARGS-32 = --with-xmms
+CONFIGURE_ARGS-64 = 
+
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-drm
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
+# This is a hard package... add when ready.
+# CONFIGURE_ARGS += --with-mpeg4ip
+
 TEST_TARGET = check
 
 MERGE_DIRS_isa-extra = $(libdir)
 
+PKGFILES_CSWxmmsfaad2 = $(libdir)/xmms/.*
+
+CHECKPKG_OVERRIDES_CSWxmmsfaad2 += soname-not-found|libfaad.so.0|is|needed|by|opt/csw/lib/xmms/Input/libmp4.so
+
 include gar/category.mk

Modified: csw/mgar/pkg/libfaad2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/checksums	2010-07-28 08:59:54 UTC (rev 10618)
+++ csw/mgar/pkg/libfaad2/trunk/checksums	2010-07-28 10:32:50 UTC (rev 10619)
@@ -1,4 +1,5 @@
 03a038258ea594c90c9b58e8572a262b  0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch
 ea595fc8a7759c1ca424bcb226c52975  0002-Use-inline-suitable-for-SS.patch
 548781681ae7b3ad6e3ae9c2ff556f11  0003-Use-inttypes-instead-of-stdint.patch
+55549d920bf05c0b6ad3f36f10d450ff  0004-Remove-Wall-from-xmms-plugin.patch
 4c332fa23febc0e4648064685a3d4332  faad2-2.7.tar.bz2

Added: csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch	                        (rev 0)
+++ csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch	2010-07-28 10:32:50 UTC (rev 10619)
@@ -0,0 +1,46 @@
+From 761b095edbd318055af35eaabe68fd1b9c213dec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 28 Jul 2010 11:11:37 +0200
+Subject: [PATCH] Remove -Wall from xmms plugin
+
+---
+ plugins/xmms/src/Makefile.am |    4 ++--
+ plugins/xmms/src/Makefile.in |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/xmms/src/Makefile.am b/plugins/xmms/src/Makefile.am
+index 6249bb3..b373f39 100644
+--- a/plugins/xmms/src/Makefile.am
++++ b/plugins/xmms/src/Makefile.am
+@@ -1,9 +1,9 @@
+-local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
++local_CFLAGS=`$(XMMS_CONFIG) --cflags`
+ local_LDFLAGS=`$(XMMS_CONFIG) --libs`
+ libdir = `$(XMMS_CONFIG) --input-plugin-dir`
+ lib_LTLIBRARIES = libmp4.la
+ 
+-libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
++libmp4_la_CFLAGS = $(local_CFLAGS) \
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ 
+ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+diff --git a/plugins/xmms/src/Makefile.in b/plugins/xmms/src/Makefile.in
+index 4d0b6c6..dfca4b0 100644
+--- a/plugins/xmms/src/Makefile.in
++++ b/plugins/xmms/src/Makefile.in
+@@ -186,10 +186,10 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-local_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall
++local_CFLAGS = `$(XMMS_CONFIG) --cflags`
+ local_LDFLAGS = `$(XMMS_CONFIG) --libs`
+ lib_LTLIBRARIES = libmp4.la
+-libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
++libmp4_la_CFLAGS = $(local_CFLAGS) \
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ 
+ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.