[csw-devel] SF.net SVN: gar:[14951] csw/mgar/pkg/speex/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14951
          http://gar.svn.sourceforge.net/gar/?rev=14951&view=rev
Author:   dmichelsen
Date:     2011-07-01 17:56:25 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
speex: Split package and general cleanup

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

Modified: csw/mgar/pkg/speex/trunk/Makefile
===================================================================
--- csw/mgar/pkg/speex/trunk/Makefile	2011-07-01 05:30:48 UTC (rev 14950)
+++ csw/mgar/pkg/speex/trunk/Makefile	2011-07-01 17:56:25 UTC (rev 14951)
@@ -3,8 +3,7 @@
 # $Id$
 
 NAME = speex
-VERSION = 1.2
-REV = rc1
+VERSION = 1.2rc1
 CATEGORIES = lib
 
 DESCRIPTION = Speex audio codec support library
@@ -12,7 +11,7 @@
 endef
 
 MASTER_SITES = http://downloads.xiph.org/releases/speex/
-DISTFILES  = $(NAME)-$(VERSION)$(REV).tar.gz
+DISTFILES  = $(DISTNAME).tar.gz
 
 # The important lines are these:
 #
@@ -34,27 +33,43 @@
 # All the other stuff is generated (and the newlines on getopt*.c were stripped of ^M)
 PATCHFILES = speex-getopt.patch.bz2
 
+VENDOR_URL = http://www.speex.org/
+
+BUILD_DEP_PKGS += CSWlibogg-dev
+
 PACKAGES = CSWspeex
-CATALOGNAME = libspeex
-RUNTIME_DEP_PKGS = CSWlibogg
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
+SPKG_DESC_CSWspeex = Speex audio codec tools
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWspeex += CSWlibspeex1
+RUNTIME_DEP_PKGS_CSWspeex += CSWlibspeexdsp1
+RUNTIME_DEP_PKGS_CSWspeex += CSWlibogg0
 
-SPKG_SOURCEURL = http://www.speex.org/
+PACKAGES += CSWlibspeex-dev
+SPKG_DESC_CSWlibspeex-dev = Development files for libspeex.so.1
+PKGFILES_CSWlibspeex-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibspeex-dev += $(docdir)/libspeex/manual.pdf
+RUNTIME_DEP_PKGS_CSWlibspeex-dev += CSWlibspeex1
+RUNTIME_DEP_PKGS_CSWlibspeex-dev += CSWlibspeexdsp1
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PACKAGES += CSWlibspeex1
+SPKG_DESC_CSWlibspeex1 = Speex audio codec library, libspeex.so.1
+PKGFILES_CSWlibspeex1 += $(call pkgfiles_lib,libspeex.so.1)
 
-WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)$(REV)
+PACKAGES += CSWlibspeexdsp1
+SPKG_DESC_CSWlibspeexdsp1 = Speex audio codec support library, libspeexdsp.so.1
+PKGFILES_CSWlibspeexdsp1 += $(call pkgfiles_lib,libspeexdsp.so.1)
 
 # 64-bit doesn't build on x86.
 BUILD64 = 1
-CONFIGURE_ARGS = $(DIRPATHS)
-TEST_SCRIPTS =
+# TEST_SCRIPTS =
 
+CONFIGURE_ARGS += $(DIRPATHS)
+# Otherwise we must unnecessarily link to CSW provided libgnugetopt
+CONFIGURE_ARGS += ac_cv_func_getopt_long=no
+CONFIGURE_ARGS += ac_cv_lib_gnugetopt_getopt_long=no
+
 INSTALL_OVERRIDE_VARS = PACKAGE
 INSTALL_OVERRIDE_VAR_PACKAGE = libspeex
 
 include gar/category.mk
 
-SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV)
-

Modified: csw/mgar/pkg/speex/trunk/checksums
===================================================================
--- csw/mgar/pkg/speex/trunk/checksums	2011-07-01 05:30:48 UTC (rev 14950)
+++ csw/mgar/pkg/speex/trunk/checksums	2011-07-01 17:56:25 UTC (rev 14951)
@@ -1,2 +1 @@
-c4438b22c08e5811ff10e2b06ee9b9ae  download/speex-1.2rc1.tar.gz
-fe24237dc5e9cea5d5896dffa10c6c06  download/speex-getopt.patch.bz2
+c4438b22c08e5811ff10e2b06ee9b9ae  speex-1.2rc1.tar.gz


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