r5450 - in packages/branches/openal/andres/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Fri Jan 18 05:15:35 UTC 2008
Author: ceros-guest
Date: 2008-01-18 05:15:34 +0000 (Fri, 18 Jan 2008)
New Revision: 5450
Modified:
packages/branches/openal/andres/debian/changelog
packages/branches/openal/andres/debian/control
packages/branches/openal/andres/debian/copyright
packages/branches/openal/andres/debian/openal-get-orig-source
packages/branches/openal/andres/debian/patches/kfreebsd_linking.diff
packages/branches/openal/andres/debian/patches/pkg-config_drop_requirements.diff
packages/branches/openal/andres/debian/patches/series
packages/branches/openal/andres/debian/rules
Log:
* Add myself in uploaders field.
* Bumped Standards-Version to 3.7.3.
* Removed XS- prefix from Vcs entries.
* Changed Build-Depends of libsdl1.2-dev to libsdl1.2-dev | libsdl-dev.
* Add Build-Depends of libtool and automake again.
* Removed use of enable-capture, doesn't exist anymore.
* Removed use of enable-arts, no longer supported.
* Upstream supports yasm or nasm. Declare Build-Depends of nasm | yasm.
* Supply some DEB_BUILD_OPTIONS.
* Supply an OPENAL_OPTIONS variable to use for supplying options to
OpenAL's configure script.
* Updated kfreebsd_linking and pkg-config_drop_requirements patches.
* Don't need a Depends on libc-dev for libopenal-dev.
* Do need a Depends on libsdl1.2-dev (>= 1.2.7) | libsdl-dev, libesd0-dev,
libsmpeg-dev, libvorbis-dev (>= 1.0.1), libasound2-dev (>= 1.0.5)
* Updated copyright file to show where upstream source was downloaded from.
Modified: packages/branches/openal/andres/debian/changelog
===================================================================
--- packages/branches/openal/andres/debian/changelog 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/changelog 2008-01-18 05:15:34 UTC (rev 5450)
@@ -1,4 +1,4 @@
-openal (1.0~svn20080117.r1469-1~unreleased0) experimental; urgency=low
+openal (1.1.0~svn20080117.r1469-1~unreleased0) experimental; urgency=low
[ Cyril Brulebois ]
* New upstream snapshot.
@@ -50,7 +50,23 @@
[ Andres Mejia ]
* Add script to generate orig tarball.
- * Using proper CFLAGS.
+ * Add myself in uploaders field.
+ * Bumped Standards-Version to 3.7.3.
+ * Removed XS- prefix from Vcs entries.
+ * Changed Build-Depends of libsdl1.2-dev to libsdl1.2-dev | libsdl-dev.
+ * Add Build-Depends of libtool and automake again.
+ * Removed use of enable-capture, doesn't exist anymore.
+ * Removed use of enable-arts, no longer supported.
+ * Upstream supports yasm or nasm. Declare Build-Depends of nasm | yasm.
+ * Supply some DEB_BUILD_OPTIONS.
+ * Supply an OPENAL_OPTIONS variable to use for supplying options to
+ OpenAL's configure script.
+ * Updated kfreebsd_linking and pkg-config_drop_requirements patches.
+ * Don't need a Depends on libc-dev for libopenal-dev.
+ * Do need a Depends on libsdl1.2-dev (>= 1.2.7) | libsdl-dev, libesd0-dev,
+ libsmpeg-dev, libvorbis-dev (>= 1.0.1), libasound2-dev (>= 1.0.5)
+ [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] for libopenal-dev.
+ * Updated copyright file to show where upstream source was downloaded from.
-- Andres Mejia <mcitadel at gmail.com> Thu, 17 Jan 2008 19:15:00 -0500
Modified: packages/branches/openal/andres/debian/control
===================================================================
--- packages/branches/openal/andres/debian/control 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/control 2008-01-18 05:15:34 UTC (rev 5450)
@@ -2,17 +2,17 @@
Section: libs
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Reinhard Tartler <siretart at tauware.de>, Thierry Reding <thierry at doppeltgemoppelt.de>, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev (>= 1.2.7), libesd0-dev, libsmpeg-dev, libvorbis-dev (>= 1.0.1), libasound2-dev (>= 1.0.5) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], cmake, pkg-config, nasm
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openal/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openal/?op=log
+Uploaders: Reinhard Tartler <siretart at tauware.de>, Thierry Reding <thierry at doppeltgemoppelt.de>, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, Gonéri Le Bouder <goneri at rulezlan.org>, Andres Mejia <mcitadel at gmail.com>
+Build-Depends: debhelper (>= 5.0.0), automake, libtool, pkg-config, nasm | yasm, libsdl1.2-dev (>= 1.2.7) | libsdl-dev, libesd0-dev, libsmpeg-dev, libvorbis-dev (>= 1.0.1), libasound2-dev (>= 1.0.5) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openal/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openal/?op=log
Homepage: http://openal.org/
Package: libopenal-dev
Section: libdevel
Architecture: any
-Depends: libopenal1 (= ${binary:Version}), libc-dev
+Depends: libopenal1 (= ${binary:Version}), libsdl1.2-dev (>= 1.2.7) | libsdl-dev, libesd0-dev, libsmpeg-dev, libvorbis-dev (>= 1.0.1), libasound2-dev (>= 1.0.5) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
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
@@ -22,8 +22,6 @@
.
This packages contains the header files and static libraries needed for
development.
- .
- Homepage: http://openal.org/
Package: libopenal1
Section: libs
@@ -37,6 +35,3 @@
audio. OpenAL's primary audience are application developers and desktop
users that rely on portable standards like OpenGL, for games and other
multimedia applications.
- .
- Homepage: http://openal.org/
-
Modified: packages/branches/openal/andres/debian/copyright
===================================================================
--- packages/branches/openal/andres/debian/copyright 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/copyright 2008-01-18 05:15:34 UTC (rev 5450)
@@ -1,7 +1,8 @@
This package was debianized by Dan Helfman <witten at debian.org> on
Fri, 15 Dec 2000 01:31:53 -0800.
-It was downloaded from http://www.openal.org/
+It was downloaded from SVN at
+http://www.openal.org/repos/openal/trunk/OpenAL-Sample/ using revision 1469.
More information is available at http://www.openal.org/
Modified: packages/branches/openal/andres/debian/openal-get-orig-source
===================================================================
--- packages/branches/openal/andres/debian/openal-get-orig-source 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/openal-get-orig-source 2008-01-18 05:15:34 UTC (rev 5450)
@@ -8,7 +8,7 @@
ORIGINAL_DATE="20080117"
REVISION="1469"
#OPENAL_TARBALL=""
-OPENAL_VERSION="1.0~svn$ORIGINAL_DATE.r$REVISION"
+OPENAL_VERSION="1.1.0~svn$ORIGINAL_DATE.r$REVISION"
if [ ! -d openal-$OPENAL_VERSION ]; then
# Checkout from SVN
Modified: packages/branches/openal/andres/debian/patches/kfreebsd_linking.diff
===================================================================
--- packages/branches/openal/andres/debian/patches/kfreebsd_linking.diff 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/patches/kfreebsd_linking.diff 2008-01-18 05:15:34 UTC (rev 5450)
@@ -9,15 +9,3 @@
# On Linux we want to actually link to pthread library, so test lib first
-diff -ur openal-0.0.8/configure openal/configure
---- openal-0.0.8/configure 2006-02-11 11:40:04.000000000 +0100
-+++ openal/configure 2007-07-25 21:44:41.000000000 +0200
-@@ -20678,7 +20678,7 @@
- ;;
-
-
-- *linux*)
-+ *linux*|*-k*bsd*-gnu)
-
- # On Linux we want to actually link to pthread library, so test lib first
-
Modified: packages/branches/openal/andres/debian/patches/pkg-config_drop_requirements.diff
===================================================================
--- packages/branches/openal/andres/debian/patches/pkg-config_drop_requirements.diff 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/patches/pkg-config_drop_requirements.diff 2008-01-18 05:15:34 UTC (rev 5450)
@@ -4,7 +4,7 @@
Name: OpenAL
Description: OpenAL is a cross-platform 3D audio API.
--Requires: @requirements@
+-Requires: @PKG_CONFIG_REQUIRES@
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lopenal
Cflags: -I${includedir}
Modified: packages/branches/openal/andres/debian/patches/series
===================================================================
--- packages/branches/openal/andres/debian/patches/series 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/patches/series 2008-01-18 05:15:34 UTC (rev 5450)
@@ -1,5 +1,2 @@
-fix_gcc-4.2.diff
kfreebsd_linking.diff
pkg-config_drop_requirements.diff
-undocumented_alext_header.diff
-x64_64-disable-MMX.diff -p0
Modified: packages/branches/openal/andres/debian/rules
===================================================================
--- packages/branches/openal/andres/debian/rules 2008-01-18 01:19:24 UTC (rev 5449)
+++ packages/branches/openal/andres/debian/rules 2008-01-18 05:15:34 UTC (rev 5450)
@@ -1,70 +1,122 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# From the autotools-dev document README.Debian section "Calling GNU configure
+# properly".
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Support 'noopt' option.
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0 -g -Wall
+ OPTIMIZATION_OPTIONS = --disable-optimization
else
-CFLAGS += -O2 -g -Wall
+ OPTIMIZATION_OPTIONS = --enable-optimization
endif
-BUILD_TREE=$(CURDIR)/build-tree
+# Support 'nostrip' option. This will imply 'noopt'.
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ DEBUG_OPTIONS = --enable-debug
+ OPTIMIZATION_OPTIONS = --disable-optimization
+# Support a 'debugmax' option that enables all debugging for openal as well.
+ifneq (,$(findstring debugmax,$(DEB_BUILD_OPTIONS)))
+ DEBUG_OPTIONS += --enable-debug-maximus
+endif
+endif
-configure: configure-stamp
+# Support a 'morewarnings' option that will display extra warnings besides
+# the ones already given with the gcc -Wall option.
+# The default is to just enable normal warnings "-Wall".
+WARNING_OPTIONS = --enable-warnings
+ifneq (,$(findstring morewarnings,$(DEB_BUILD_OPTIONS)))
+ WARNING_OPTIONS += --enable-more-warnings
+endif
+
+# There will also be support for other options not used for normal building
+# through the use of the environment variable OPENAL_OPTIONS. Any option
+# available in the configure script can be used with this variable.
+
+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
-
- # Perform an out-of-tree build to keep a clean source tree
- mkdir $(BUILD_TREE)
- cd $(BUILD_TREE); cmake .. \
- -DCMAKE_INSTALL_PREFIX:STRING="/usr" -DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \
- -DBUILD_STATIC:BOOL=ON
-
+ # Declare everything obsolete.
+ rm -rf autom4te.cache
+ libtoolize -f -c
+ aclocal -I admin/autotools/m4
+ autoheader -f
+ automake -a -c -f
+ autoconf -f
+ ./configure $(confflags) \
+ $(OPTIMIZATION_OPTIONS) \
+ $(DEBUG_OPTIONS) \
+ $(WARNING_OPTIONS) \
+ $(OPENAL_OPTIONS) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --enable-alsa \
+ --enable-esd \
+ --enable-sdl \
+ --enable-vorbis \
+ --enable-mp3
touch configure-stamp
-build: configure-stamp build-stamp
+build: configure build-stamp
build-stamp:
dh_testdir
-
- cd $(BUILD_TREE); $(MAKE)
-
+ $(MAKE)
touch build-stamp
-clean:
+clean: clean-stamp unpatch
+clean-stamp:
dh_testdir
dh_testroot
- rm -fr build-stamp configure-stamp
- rm -fr $(BUILD_TREE)
+ [ ! -f Makefile ] || $(MAKE) clean distclean
dh_clean
+ [ ! -f build-stamp ] || rm build-stamp
+ [ ! -f configure-stamp ] || rm configure-stamp
+unpatch:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ [ ! -f patch-stamp ] || rm patch-stamp
+
install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
- cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# We have nothing to do by default.
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
-
dh_install
dh_installdocs -A AUTHORS NOTES TODO
dh_installman
dh_installchangelogs ChangeLog
dh_link
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip
+endif
dh_compress
dh_fixperms
dh_makeshlibs
More information about the Pkg-games-commits
mailing list