r6719 - in packages/trunk/openal-soft/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Wed Apr 23 05:29:22 UTC 2008
Author: ceros-guest
Date: 2008-04-23 05:29:21 +0000 (Wed, 23 Apr 2008)
New Revision: 6719
Added:
packages/trunk/openal-soft/debian/patches/
packages/trunk/openal-soft/debian/patches/series
packages/trunk/openal-soft/debian/patches/static_lib.patch
Modified:
packages/trunk/openal-soft/debian/TODO
packages/trunk/openal-soft/debian/changelog
packages/trunk/openal-soft/debian/control
packages/trunk/openal-soft/debian/libopenal-dev.install
packages/trunk/openal-soft/debian/rules
Log:
* Support building of static libraries.
* Added myself in Uploaders field.
* Set libopenal-dev to depend on binary version.
Modified: packages/trunk/openal-soft/debian/TODO
===================================================================
--- packages/trunk/openal-soft/debian/TODO 2008-04-23 04:38:20 UTC (rev 6718)
+++ packages/trunk/openal-soft/debian/TODO 2008-04-23 05:29:21 UTC (rev 6719)
@@ -1 +1,2 @@
-* Fix build of static library
+* Get with all maintainers of reverse dependencies of openal and start testing
+ this new version of openal.
Modified: packages/trunk/openal-soft/debian/changelog
===================================================================
--- packages/trunk/openal-soft/debian/changelog 2008-04-23 04:38:20 UTC (rev 6718)
+++ packages/trunk/openal-soft/debian/changelog 2008-04-23 05:29:21 UTC (rev 6719)
@@ -8,5 +8,8 @@
* Allow options passed to cmake to be overridable using DEB_CMAKE_OPTIONS.
* Support nostrip option.
* Build "Release" type libraries by default.
+ * Support building of static libraries.
+ * Added myself in Uploaders field.
+ * Set libopenal-dev to depend on binary version.
-- Bruno "Fuddl" Kleinert <fuddl at tauware.de> Thu, 27 Mar 2008 16:05:18 +0100
Modified: packages/trunk/openal-soft/debian/control
===================================================================
--- packages/trunk/openal-soft/debian/control 2008-04-23 04:38:20 UTC (rev 6718)
+++ packages/trunk/openal-soft/debian/control 2008-04-23 05:29:21 UTC (rev 6719)
@@ -1,8 +1,8 @@
Source: openal-soft
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>
-Build-Depends: debhelper (>= 5), libasound2-dev, cmake
+Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>, Andres Mejia <mcitadel at gmail.com>
+Build-Depends: debhelper (>= 5), quilt, libasound2-dev, cmake
Standards-Version: 3.7.3
Section: libs
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openal-soft/
@@ -12,7 +12,7 @@
Package: libopenal-dev
Section: libdevel
Architecture: any
-Depends: libopenal1 (= ${Source-Version})
+Depends: libopenal1 (= ${binary:Version})
Description: OpenAL is a portable library for 3D spatialized audio
OpenAL, the Open Audio Library, is a joint effort to create an open,
vendor-neutral, cross-platform API for interactive, primarily spatialized
Modified: packages/trunk/openal-soft/debian/libopenal-dev.install
===================================================================
--- packages/trunk/openal-soft/debian/libopenal-dev.install 2008-04-23 04:38:20 UTC (rev 6718)
+++ packages/trunk/openal-soft/debian/libopenal-dev.install 2008-04-23 05:29:21 UTC (rev 6719)
@@ -1,2 +1,3 @@
debian/tmp/usr/include/AL
debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/lib*.a
Added: packages/trunk/openal-soft/debian/patches/series
===================================================================
--- packages/trunk/openal-soft/debian/patches/series (rev 0)
+++ packages/trunk/openal-soft/debian/patches/series 2008-04-23 05:29:21 UTC (rev 6719)
@@ -0,0 +1 @@
+static_lib.patch
Added: packages/trunk/openal-soft/debian/patches/static_lib.patch
===================================================================
--- packages/trunk/openal-soft/debian/patches/static_lib.patch (rev 0)
+++ packages/trunk/openal-soft/debian/patches/static_lib.patch 2008-04-23 05:29:21 UTC (rev 6719)
@@ -0,0 +1,36 @@
+Support building of static libraries
+=====================================================================
+--- ./CMakeLists.txt.bak 2008-04-23 01:08:34.000000000 -0400
++++ ./CMakeLists.txt 2008-04-23 01:09:25.000000000 -0400
+@@ -24,6 +24,9 @@
+
+ OPTION(WERROR "Treat compile warnings as errors" OFF)
+
++# Add option to build static libraries
++OPTION(BUILD_STATIC "build static library too" OFF)
++
+
+ SET(LIB_MAJOR_VERSION "1")
+ SET(LIB_MINOR_VERSION "3")
+@@ -307,6 +310,21 @@
+
+ TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
+
++# Build static libraries if specified
++IF(BUILD_STATIC)
++ # we can't create a static library with the same name
++ # as the shared one, so we use OUTPUT_NAME
++ ADD_LIBRARY(openal_static STATIC ${OPENAL_OBJS} ${ALC_OBJS})
++ SET_TARGET_PROPERTIES(openal_static PROPERTIES OUTPUT_NAME ${LIBNAME})
++ IF(WIN32)
++ SET_TARGET_PROPERTIES(openal_static PROPERTIES PREFIX "")
++ ENDIF()
++ TARGET_LINK_LIBRARIES(openal_static ${EXTRA_LIBS})
++ INSTALL(TARGETS openal_static
++ ARCHIVE DESTINATION lib
++ )
++ENDIF(BUILD_STATIC)
++
+ # Add an install target here
+ INSTALL(TARGETS ${LIBNAME}
+ RUNTIME DESTINATION bin
Modified: packages/trunk/openal-soft/debian/rules
===================================================================
--- packages/trunk/openal-soft/debian/rules 2008-04-23 04:38:20 UTC (rev 6718)
+++ packages/trunk/openal-soft/debian/rules 2008-04-23 05:29:21 UTC (rev 6719)
@@ -26,11 +26,18 @@
-DCMAKE_BUILD_TYPE=$(TYPE) \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_C_FLAGS="$(CFLAGS)" \
+ -DBUILD_STATIC=ON \
..
BUILD_TREE=$(CURDIR)/build-tree
-configure: configure-stamp
+patch: patch-stamp
+patch-stamp:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch patch-stamp
+
+configure: patch configure-stamp
configure-stamp:
dh_testdir
mkdir -p $(BUILD_TREE)
@@ -38,19 +45,25 @@
cmake $(DEB_CMAKE_OPTIONS)
touch configure-stamp
-build: build-stamp
-build-stamp: configure-stamp
+build: configure build-stamp
+build-stamp:
dh_testdir
$(MAKE) --directory=$(BUILD_TREE)
touch $@
-clean:
+clean: clean-stamp unpatch
+clean-stamp:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
rm -rf $(BUILD_TREE)
dh_clean
+unpatch:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -f patch-stamp
+
install: build
dh_testdir
dh_testroot
More information about the Pkg-games-commits
mailing list