[csw-devel] SF.net SVN: gar:[14322] csw/mgar/pkg/libflac8/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14322
          http://gar.svn.sourceforge.net/gar/?rev=14322&view=rev
Author:   dmichelsen
Date:     2011-04-18 14:50:40 +0000 (Mon, 18 Apr 2011)

Log Message:
-----------
libflac8: Further add splitting, docs, defaults

Modified Paths:
--------------
    csw/mgar/pkg/libflac8/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch

Modified: csw/mgar/pkg/libflac8/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libflac8/trunk/Makefile	2011-04-18 14:28:29 UTC (rev 14321)
+++ csw/mgar/pkg/libflac8/trunk/Makefile	2011-04-18 14:50:40 UTC (rev 14322)
@@ -21,6 +21,7 @@
 PATCHFILES += libtool-64bit.patch
 PATCHFILES += strip-nasm-1.2.1.patch
 PATCHFILES += no-stdint.patch
+PATCHFILES += 0004-Preserve-norunpath-in-libtool.patch
 
 BUILD_DEP_PKGS += CSWbash
 
@@ -28,17 +29,51 @@
 CATALOGNAME_CSWlibflac8 = libflac8
 SPKG_DESC_CSWlibflac8 = Free lossless audio codec library, libflac.so.8
 PKGFILES_CSWlibflac8 = $(call pkgfiles_lib,libFLAC.so.8)
-RUNTIME_DEP_PKGS_CSWlibflac8 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibflac8 += CSWlibogg0
+OBSOLETED_BY_CSWlibflac8 = CSWlibflac
 
-# Override conflicts with CSWflac as the new CSWflac is built from the latest libflac
-CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7.0.0|CSWflac|CSWlibflac7
-CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7|CSWflac|CSWlibflac7
+PACKAGES += CSWlibflac++6
+CATALOGNAME_CSWlibflac++6 = libflac++6
+SPKG_DESC_CSWlibflac++6 = Free lossless audio codec library, libFLAC++.so.6
+PKGFILES_CSWlibflac++6 = $(call pkgfiles_lib,libFLAC++.so.6)
+RUNTIME_DEP_PKGS_CSWlibflac++6 += CSWlibflac8
+OBSOLETED_BY_CSWlibflac++6 = CSWlibflac
 
+PACKAGES += CSWlibflac-dev
+CATALOGNAME_CSWlibflac-dev = libflac_dev
+SPKG_DESC_CSWlibflac-dev = Development files for libflac.so.8
+PKGFILES_CSWlibflac-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibflac-dev += $(docdir)/flac/.*
+RUNTIME_DEP_PKGS_CSWlibflac-dev = CSWlibflac8
+RUNTIME_DEP_PKGS_CSWlibflac-dev += CSWlibflac++6
+
+PACKAGES += CSWlibflac-utils
+CATALOGNAME_CSWlibflac-utils = libflac_utils
+SPKG_DESC_CSWlibflac-utils = Utility programs for the Free Lossless Audio Codec (FLAC)
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibflac-utils += CSWlibflac8
+OBSOLETED_BY_CSWlibflac-utils = CSWflac
+
+PACKAGES += CSWxmms-flac
+PKGFILES_CSWxmms-flac = $(libdir)/xmms/.*
+SPKG_DESC_CSWxmms-flac = XMMS plugin for the FLAC audio file format
+RUNTIME_DEP_PKGS_CSWxmms-flac += CSWglib
+RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWxmms-flac += CSWgtk
+RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibflac8
+RUNTIME_DEP_PKGS_CSWxmms-flac += CSWxmms
+OBSOLETED_BY_CSWxmms-flac = CSWxmmsflac
+
+
 VENDOR_URL = http://flac.sourceforge.net/
 
 LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic))
 
 # EXTRA_LINKER_FLAGS = -liconv -lm
+EXTRA_LINKER_FLAGS = -norunpath
+# EXTRA_CXXFLAGS = -norunpath
 
 # Must be defined and empty or -I$(includedir) is added too early
 # EXTRA_INC = ../../include
@@ -48,6 +83,8 @@
 
 STRIP_LIBTOOL = 1
 
+BUILD64 = 1
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin
@@ -56,10 +93,10 @@
 # XXX: Assembler optimization just doesn't work. Disable for now.
 CONFIGURE_ARGS += --disable-asm-optimizations
 
-TEST_TARGET = check
+EXTRA_PAX_ARGS = -s ',$(docdir)/flac-$(VERSION),$(docdir)/flac,'
 
-# There is one test failing, but as this is really a long-outdated legacy library
-# I don't care much for now.
-# SKIPTEST ?= 1
+include gar/category.mk
 
-include gar/category.mk
+post-install-modulated:
+	perl -pi -e 's,/usr/share/doc,$(docdir),' \
+		$(DESTDIR)$(mandir)/man1/flac.1

Added: csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch
===================================================================
--- csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch	                        (rev 0)
+++ csw/mgar/pkg/libflac8/trunk/files/0004-Preserve-norunpath-in-libtool.patch	2011-04-18 14:50:40 UTC (rev 14322)
@@ -0,0 +1,25 @@
+From 4593b146f039662547960a5b72858f1e48822ffd Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 18 Apr 2011 15:56:36 +0200
+Subject: [PATCH] Preserve norunpath in libtool
+
+---
+ ltmain.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 7a320ef..e19a625 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -1533,7 +1533,7 @@ EOF
+       # +DA*, +DD* enable 64-bit mode on the HP compiler
+       # -q* pass through compiler args for the IBM compiler
+       # -m* pass through architecture-specific compiler args for GCC
+-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-norunpath)
+ 
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+-- 
+1.7.3.2
+


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