[csw-devel] SF.net SVN: gar:[7461] csw/mgar/pkg/a52dec/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7461
          http://gar.svn.sourceforge.net/gar/?rev=7461&view=rev
Author:   dmichelsen
Date:     2009-11-26 15:49:22 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
liba52: Fix 64 bit

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

Added Paths:
-----------
    csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch
    csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32
    csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64

Modified: csw/mgar/pkg/a52dec/trunk/Makefile
===================================================================
--- csw/mgar/pkg/a52dec/trunk/Makefile	2009-11-26 15:04:55 UTC (rev 7460)
+++ csw/mgar/pkg/a52dec/trunk/Makefile	2009-11-26 15:49:22 UTC (rev 7461)
@@ -4,11 +4,14 @@
 
 DESCRIPTION = A free ATSC A/52 stream decoder
 define BLURB
-  liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms of the GPL license. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3.
+  liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms
+  of the GPL license. The A/52 standard is used in a variety of applications, including
+  digital television and DVD. It is also known as AC-3.
 endef
 
 MASTER_SITES = http://liba52.sourceforge.net/files/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += liba52.pc-32 liba52.pc-64
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/
@@ -17,6 +20,7 @@
 PACKAGES = CSWliba52
 CATALOGNAME = a52dec
 
+REQUIRED_PKGS = CSWsunmath
 EXTRA_LINKER_FLAGS = -lsunmath
 
 BUILD64 = 1
@@ -24,7 +28,15 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 
+# This stupid configure script adds '-fast' overwriting -xarch and
+# especially activating 64 bit.
+BUILD_ARGS = CFLAGS="$(CFLAGS)"
+
 MERGE_DIRS_isa-extra = $(libdir)
 
 include gar/category.mk
 
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(libdir)/pkgconfig
+	ginstall $(WORKDIR)/liba52.pc-$(MEMORYMODEL) $(DESTDIR)$(libdir)/pkgconfig/liba52.pc
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/a52dec/trunk/checksums
===================================================================
--- csw/mgar/pkg/a52dec/trunk/checksums	2009-11-26 15:04:55 UTC (rev 7460)
+++ csw/mgar/pkg/a52dec/trunk/checksums	2009-11-26 15:49:22 UTC (rev 7461)
@@ -1 +1,3 @@
 caa9f5bc44232dc8aeea773fea56be80  a52dec-0.7.4.tar.gz
+4bdd6062a5b602334c797a2e29c47eea  liba52.pc-32
+85e441dbe0432db6925e15c60a1627ff  liba52.pc-64

Added: csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch
===================================================================
--- csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch	                        (rev 0)
+++ csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch	2009-11-26 15:49:22 UTC (rev 7461)
@@ -0,0 +1,27 @@
+From 16a37676464c7e728d930a8c044a8917c6198aa8 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 26 Nov 2009 16:11:48 +0100
+Subject: [PATCH] Fix 64 bit libtool
+
+---
+ autotools/ltmain.sh |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/autotools/ltmain.sh b/autotools/ltmain.sh
+index a926477..5b3be50 100644
+--- a/autotools/ltmain.sh
++++ b/autotools/ltmain.sh
+@@ -1191,6 +1191,10 @@ compiler."
+ 	continue
+ 	;;
+ 
++      -xarch=*)
++        linker_flags="$linker_flags $flag"
++        # Fall through
++
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+-- 
+1.6.5.1
+

Added: csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32
===================================================================
--- csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32	                        (rev 0)
+++ csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32	2009-11-26 15:49:22 UTC (rev 7461)
@@ -0,0 +1,10 @@
+prefix=/opt/csw
+exec_prefix=/opt/csw
+libdir=/opt/csw/lib
+includedir=/opt/csw/include
+
+Name: liba52
+Description: A decoding library for ATSC A/52 streams.
+Version: 0.7.4
+Libs: -L${libdir} -la52
+Cflags: -I${includedir}/a52dec

Added: csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64
===================================================================
--- csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64	                        (rev 0)
+++ csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64	2009-11-26 15:49:22 UTC (rev 7461)
@@ -0,0 +1,10 @@
+prefix=/opt/csw
+exec_prefix=/opt/csw
+libdir=/opt/csw/lib/64
+includedir=/opt/csw/include
+
+Name: liba52
+Description: A decoding library for ATSC A/52 streams.
+Version: 0.7.4
+Libs: -L${libdir} -la52
+Cflags: -I${includedir}/a52dec


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