[SCM] Packaging for openal-soft branch, master, updated. debian/1.7.411-2-8-gbfebb51
Andres Mejia
mcitadel at gmail.com
Sun May 17 05:34:44 UTC 2009
The following commit has been merged in the master branch:
commit 1a622f7d2665594e7854dfda1573ba4761553881
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun May 17 01:01:40 2009 -0400
Add patches to install openal-config and manpage through build system.
Refreshed corresponding patches.
diff --git a/debian/libopenal-dev.manpages b/debian/libopenal-dev.manpages
index a87807c..cb62cfa 100644
--- a/debian/libopenal-dev.manpages
+++ b/debian/libopenal-dev.manpages
@@ -1 +1 @@
-debian/openal-config.1
+debian/tmp/usr/share/man/man1/openal-config.1
diff --git a/debian/openal-config b/debian/openal-config
deleted file mode 100644
index 1bf43c6..0000000
--- a/debian/openal-config
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/sh
-
-prefix="/usr"
-exec_prefix="${prefix}"
-bindir="${exec_prefix}/bin"
-includedir="${prefix}/include"
-libdir="${exec_prefix}/lib"
-PACKAGE_VERSION="1.7.411"
-# PTHREAD_CFLAGS=""
-# PTHREAD_LIBS="-lpthread"
-
-openal_dynamic_ldflags="-lopenal"
-# TODO: configure should provide the following...
-openal_static_ldflags="-lopenal"
-
-prefix_set=no
-echo_prefix=no
-exec_prefix_set=no
-echo_exec_prefix=no
-bindir_set=no
-echo_bindir=no
-includedir_set=no
-echo_includedir=no
-libdir_set=no
-echo_libdir=no
-echo_version=no
-echo_cflags=no
-static_libs=no
-echo_libs=no
-
-usage()
-{
- cat <<EOF 1>&2
-Usage: openal-config [OPTIONS]
-Options:
- --prefix[=DIR] print/set default prefix
- --exec-prefix[=DIR] print/set prefix for machine-specific files
- --bindir[=DIR] print/set prefix for executable programs
- --includedir[=DIR] print/set prefix for include files
- --libdir[=DIR] print/set prefix for libraries
- --version print OpenAL package version
- --cflags print flags for C compiler
- --static specify that static linker flags are wanted
- --libs print flags for linker
-EOF
- exit 1
-}
-
-if test $# -eq 0; then
- usage
-fi
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg="" ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix="${optarg}"
- prefix_set="yes"
- ;;
- --prefix)
- echo_prefix="yes"
- ;;
- --exec-prefix=*)
- exec_prefix="${optarg}"
- exec_prefix_set="yes"
- ;;
- --exec-prefix)
- echo_exec_prefix="yes"
- ;;
- --bindir=*)
- bindir="${optarg}"
- bindir_set="yes"
- ;;
- --bindir)
- echo_bindir="yes"
- ;;
- --includedir=*)
- includedir="${optarg}"
- includedir_set="yes"
- ;;
- --includedir)
- echo_includedir="yes"
- ;;
- --libdir=*)
- libdir="${optarg}"
- libdir_set="yes"
- ;;
- --libdir)
- echo_libdir="yes"
- ;;
- --version)
- echo_version="yes"
- ;;
- --cflags)
- echo_cflags="yes"
- ;;
- --static)
- static_libs="yes"
- ;;
- --libs)
- echo_libs="yes"
- ;;
- *)
- usage
- ;;
- esac
- shift
-done
-
-if test "${echo_prefix}" = "yes"; then
- echo "${prefix}"
-fi
-
-if test "${exec_prefix_set}" = "no" && test "${prefix_set}" = "yes"; then
- exec_prefix="$prefix"
- exec_prefix_set="yes"
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo "${exec_prefix}"
-fi
-
-if test "${bindir_set}" = "no" && test "${exec_prefix_set}" = "yes"; then
- bindir="${exec_prefix}/bin"
-fi
-
-if test "$echo_bindir" = "yes"; then
- echo "${bindir}"
-fi
-
-if test "${includedir_set}" = "no" && test "${prefix_set}" = "yes"; then
- includedir="${prefix}/include"
-fi
-
-if test "$echo_includedir" = "yes"; then
- echo "${includedir}"
-fi
-
-if test "${libdir_set}" = "no" && test "${exec_prefix_set}" = "yes"; then
- libdir="${exec_prefix}/lib"
-fi
-
-if test "$echo_libdir" = "yes"; then
- echo "${libdir}"
-fi
-
-if test "$echo_version" = "yes"; then
- echo "${PACKAGE_VERSION}"
-fi
-
-if test "$echo_cflags" = "yes"; then
- if test "${includedir}" = "/usr/include" ; then
- incpath=""
- else
- incpath="-I${includedir}"
- fi
- echo "${PTHREAD_CFLAGS} ${incpath}"
-fi
-
-if test "$echo_libs" = "yes"; then
- if test "${libdir}" = "/usr/lib" ; then
- libpathflag=""
- else
- libpathflag="-L${libdir}"
- fi
- if test "${static_libs}" = "yes"; then
- ldflags="${openal_static_ldflags}"
- else
- ldflags="${openal_dynamic_ldflags}"
- fi
- echo "${libpathflag} ${ldflags} ${PTHREAD_LIBS}"
-fi
diff --git a/debian/openal-config.1 b/debian/openal-config.1
deleted file mode 100644
index 24627a6..0000000
--- a/debian/openal-config.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.TH openal-config 1 "2008-04-23" "OpenAL 1.3.253"
-.SH NAME
-openal-config \- script to get information about the installed version of OpenAL
-.SH SYNOPSIS
-.B openal-config
-[ \-\-prefix=\fIDIR\fR ]
-[ \-\-exec-prefix=\fIDIR\fR ]
-[ \-\-version ] [ \-\-cflags ] [ \-\-libs ]
-.SH DESCRIPTION
-.B openal-config
-is a tool that is used to configure and determine the compiler and linker flags
-that should be used to compile and link programs and libraries that use OpenAL.
-.SH OPTIONS
-.TP
-.B \-\-cflags
-Print the compiler flags that are necessary to compile a program or library that
-uses OpenAL.
-.TP
-.BI \-\-exec\-prefix= DIR
-If specified, use \fIDIR\fR instead of the installation exec prefix that OpenAL
-was built with when computing the output for the \-\-cflags and \-\-libs
-options. This option must be specified before any of the \-\-cflags and \-\-libs
-options.
-.TP
-.B \-\-libs
-Print the linker flags that are necessary to link a program or library that uses
-OpenAL.
-.TP
-.BI \-\-prefix= DIR
-If specified, use \fIDIR\fR instead of the installation prefix that OpenAL was
-built with when computing the output for the \-\-cflags and \-\-libs options.
-If \-\-exec\-prefix was not specified, \fIDIR\fR is also used as exec prefix.
-This option must be specified before any of the \-\-cflags and \-\-libs options.
-.TP
-.B \-\-version
-Prints the currently installed version of OpenAL on standard output.
-.SH EXAMPLES
-.PP
-To compile a C source file for use in an executable program that uses OpenAL,
-type a command like this:
-.IP
-.B gcc $(openal\-config \-\-cflags) \-c main.c \-o main.o
-.PP
-To link the resulting object file into an executable program, use a command like
-the following:
-.IP
-.B gcc \-o my_app main.o util.o $(openal\-config \-\-libs)
-.SH AUTHOR
-OpenAL was written by Juan Carlos Arevalo Baeza, Jonathan Blow, Keith Charley,
-Scott Draeker, John Grantham, Jacob Hawley, Garin Hiebert, Carlos Hasan, Nathan
-Hill, Bill Huey, Mike Jarosch, Jean-Marc Jot, Maxim Kizub, John Kraft, Bernd
-Kreimeier, Ian Ollmann, Rick Overman, Sean L. Palmer, Sven Panne, Pierre
-Phaneuf, Terry Sikes, Joseph Valenzuela, Michael Vance, and Carlo Vogelsang.
-.PP
-This manual page was written by Thierry Reding for the Debian Project (but may
-be used by others).
diff --git a/debian/patches/add-openal-config-manpage.patch b/debian/patches/add-openal-config-manpage.patch
new file mode 100644
index 0000000..eec9817
--- /dev/null
+++ b/debian/patches/add-openal-config-manpage.patch
@@ -0,0 +1,62 @@
+Add the openal-config manpage.
+==========================================================================
+--- /dev/null
++++ b/admin/openal-config.1.in
+@@ -0,0 +1,57 @@
++.TH openal-config 1 "@DATE@" "@PACKAGE_VERSION@"
++.SH NAME
++openal-config \- script to get information about the installed version of OpenAL
++.SH SYNOPSIS
++.B openal-config
++[ \-\-prefix=\fIDIR\fR ]
++[ \-\-exec-prefix=\fIDIR\fR ]
++[ \-\-version ] [ \-\-cflags ] [ \-\-libs ]
++.SH DESCRIPTION
++.B openal-config
++is a tool that is used to configure and determine the compiler and linker flags
++that should be used to compile and link programs and libraries that use OpenAL.
++.SH OPTIONS
++.TP
++.B \-\-cflags
++Print the compiler flags that are necessary to compile a program or library that
++uses OpenAL.
++.TP
++.BI \-\-exec\-prefix= DIR
++If specified, use \fIDIR\fR instead of the installation exec prefix that OpenAL
++was built with when computing the output for the \-\-cflags and \-\-libs
++options. This option must be specified before any of the \-\-cflags and \-\-libs
++options.
++.TP
++.B \-\-libs
++Print the linker flags that are necessary to link a program or library that uses
++OpenAL.
++.TP
++.BI \-\-prefix= DIR
++If specified, use \fIDIR\fR instead of the installation prefix that OpenAL was
++built with when computing the output for the \-\-cflags and \-\-libs options.
++If \-\-exec\-prefix was not specified, \fIDIR\fR is also used as exec prefix.
++This option must be specified before any of the \-\-cflags and \-\-libs options.
++.TP
++.B \-\-version
++Prints the currently installed version of OpenAL on standard output.
++.SH EXAMPLES
++.PP
++To compile a C source file for use in an executable program that uses OpenAL,
++type a command like this:
++.IP
++.B gcc $(openal\-config \-\-cflags) \-c main.c \-o main.o
++.PP
++To link the resulting object file into an executable program, use a command like
++the following:
++.IP
++.B gcc \-o my_app main.o util.o $(openal\-config \-\-libs)
++.SH AUTHOR
++OpenAL was written by Juan Carlos Arevalo Baeza, Jonathan Blow, Keith Charley,
++Scott Draeker, John Grantham, Jacob Hawley, Garin Hiebert, Carlos Hasan, Nathan
++Hill, Bill Huey, Mike Jarosch, Jean-Marc Jot, Maxim Kizub, John Kraft, Bernd
++Kreimeier, Ian Ollmann, Rick Overman, Sean L. Palmer, Sven Panne, Pierre
++Phaneuf, Terry Sikes, Joseph Valenzuela, Michael Vance, Carlo Vogelsang, and
++Chris Robinson.
++.PP
++This manual page was written by Thierry Reding for the Debian Project (but may
++be used by others).
diff --git a/debian/patches/add-openal-config.patch b/debian/patches/add-openal-config.patch
new file mode 100644
index 0000000..4ee7f7f
--- /dev/null
+++ b/debian/patches/add-openal-config.patch
@@ -0,0 +1,178 @@
+Add openal-config.in file
+==========================================================================
+--- /dev/null
++++ b/admin/openal-config.in
+@@ -0,0 +1,173 @@
++#!/bin/sh
++
++prefix="@prefix@"
++exec_prefix="@exec_prefix@"
++bindir="@bindir@"
++includedir="@includedir@"
++libdir="@libdir@"
++PACKAGE_VERSION="@PACKAGE_VERSION@"
++
++openal_dynamic_ldflags="-lopenal"
++openal_static_ldflags="-lopenal"
++
++prefix_set=no
++echo_prefix=no
++exec_prefix_set=no
++echo_exec_prefix=no
++bindir_set=no
++echo_bindir=no
++includedir_set=no
++echo_includedir=no
++libdir_set=no
++echo_libdir=no
++echo_version=no
++echo_cflags=no
++static_libs=no
++echo_libs=no
++
++usage()
++{
++ cat <<EOF 1>&2
++Usage: openal-config [OPTIONS]
++Options:
++ --prefix[=DIR] print/set default prefix
++ --exec-prefix[=DIR] print/set prefix for machine-specific files
++ --bindir[=DIR] print/set prefix for executable programs
++ --includedir[=DIR] print/set prefix for include files
++ --libdir[=DIR] print/set prefix for libraries
++ --version print OpenAL package version
++ --cflags print flags for C compiler
++ --static specify that static linker flags are wanted
++ --libs print flags for linker
++EOF
++ exit 1
++}
++
++if test $# -eq 0; then
++ usage
++fi
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg="" ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix="${optarg}"
++ prefix_set="yes"
++ ;;
++ --prefix)
++ echo_prefix="yes"
++ ;;
++ --exec-prefix=*)
++ exec_prefix="${optarg}"
++ exec_prefix_set="yes"
++ ;;
++ --exec-prefix)
++ echo_exec_prefix="yes"
++ ;;
++ --bindir=*)
++ bindir="${optarg}"
++ bindir_set="yes"
++ ;;
++ --bindir)
++ echo_bindir="yes"
++ ;;
++ --includedir=*)
++ includedir="${optarg}"
++ includedir_set="yes"
++ ;;
++ --includedir)
++ echo_includedir="yes"
++ ;;
++ --libdir=*)
++ libdir="${optarg}"
++ libdir_set="yes"
++ ;;
++ --libdir)
++ echo_libdir="yes"
++ ;;
++ --version)
++ echo_version="yes"
++ ;;
++ --cflags)
++ echo_cflags="yes"
++ ;;
++ --static)
++ static_libs="yes"
++ ;;
++ --libs)
++ echo_libs="yes"
++ ;;
++ *)
++ usage
++ ;;
++ esac
++ shift
++done
++
++if test "${echo_prefix}" = "yes"; then
++ echo "${prefix}"
++fi
++
++if test "${exec_prefix_set}" = "no" && test "${prefix_set}" = "yes"; then
++ exec_prefix="$prefix"
++ exec_prefix_set="yes"
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo "${exec_prefix}"
++fi
++
++if test "${bindir_set}" = "no" && test "${exec_prefix_set}" = "yes"; then
++ bindir="${exec_prefix}/bin"
++fi
++
++if test "$echo_bindir" = "yes"; then
++ echo "${bindir}"
++fi
++
++if test "${includedir_set}" = "no" && test "${prefix_set}" = "yes"; then
++ includedir="${prefix}/include"
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo "${includedir}"
++fi
++
++if test "${libdir_set}" = "no" && test "${exec_prefix_set}" = "yes"; then
++ libdir="${exec_prefix}/lib"
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo "${libdir}"
++fi
++
++if test "$echo_version" = "yes"; then
++ echo "${PACKAGE_VERSION}"
++fi
++
++if test "$echo_cflags" = "yes"; then
++ if test "${includedir}" = "/usr/include" ; then
++ incpath=""
++ else
++ incpath="-I${includedir}"
++ fi
++ echo "${incpath}"
++fi
++
++if test "$echo_libs" = "yes"; then
++ if test "${libdir}" = "/usr/lib" ; then
++ libpathflag=""
++ else
++ libpathflag="-L${libdir}"
++ fi
++ if test "${static_libs}" = "yes"; then
++ ldflags="${openal_static_ldflags}"
++ else
++ ldflags="${openal_dynamic_ldflags}"
++ fi
++ echo "${libpathflag} ${ldflags}"
++fi
diff --git a/debian/patches/install-openal-config.patch b/debian/patches/install-openal-config.patch
new file mode 100644
index 0000000..c5de6c6
--- /dev/null
+++ b/debian/patches/install-openal-config.patch
@@ -0,0 +1,49 @@
+Modify CMakeLists.txt to install openal-config.
+==========================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -345,13 +345,17 @@
+ # This is always available
+ SET(BACKENDS "${BACKENDS} WaveFile")
+
+-# Needed for openal.pc.in
++# Needed for openal.pc.in and openal-config
+ SET(prefix ${CMAKE_INSTALL_PREFIX})
+ SET(exec_prefix "\${prefix}")
+ SET(libdir "\${exec_prefix}/${LIB_INSTALL_DIR}")
+ SET(bindir "\${exec_prefix}/bin")
+ SET(includedir "\${prefix}/include")
+ SET(PACKAGE_VERSION "${LIB_VERSION}")
++EXECUTE_PROCESS(COMMAND date +%Y-%m-%d
++ OUTPUT_VARIABLE date_var
++ OUTPUT_STRIP_TRAILING_WHITESPACE)
++SET(DATE ${date_var})
+
+ # End configuration
+ CONFIGURE_FILE(
+@@ -361,6 +365,14 @@
+ "${OpenAL_SOURCE_DIR}/admin/pkgconfig/openal.pc.in"
+ "${OpenAL_BINARY_DIR}/admin/pkgconfig/openal.pc"
+ @ONLY)
++CONFIGURE_FILE(
++ "${OpenAL_SOURCE_DIR}/admin/openal-config.in"
++ "${OpenAL_BINARY_DIR}/admin/openal-config"
++ @ONLY)
++CONFIGURE_FILE(
++ "${OpenAL_SOURCE_DIR}/admin/openal-config.1.in"
++ "${OpenAL_BINARY_DIR}/admin/openal-config.1"
++ @ONLY)
+
+ ADD_DEFINITIONS(-DAL_BUILD_LIBRARY)
+
+@@ -390,6 +402,10 @@
+ )
+ INSTALL(FILES "${OpenAL_BINARY_DIR}/admin/pkgconfig/openal.pc"
+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
++INSTALL(FILES "${OpenAL_BINARY_DIR}/admin/openal-config"
++ DESTINATION bin)
++INSTALL(FILES "${OpenAL_BINARY_DIR}/admin/openal-config.1"
++ DESTINATION /usr/share/man/man1)
+
+ # Install alsoft.conf configuration file
+ IF(ALSOFT_CONFIG)
diff --git a/debian/patches/series b/debian/patches/series
index 8648f0c..5117162 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
install-alsoft.conf.patch
+install-openal-config.patch
+add-openal-config.patch
+add-openal-config-manpage.patch
alsoftrc-fix.patch
static_lib.patch
diff --git a/debian/patches/static_lib.patch b/debian/patches/static_lib.patch
index ef9b0aa..08dc370 100644
--- a/debian/patches/static_lib.patch
+++ b/debian/patches/static_lib.patch
@@ -12,7 +12,7 @@ Support building of static libraries
OPTION(ALSA "Check for ALSA backend" ON)
OPTION(OSS "Check for OSS backend" ON)
-@@ -377,6 +380,21 @@
+@@ -389,6 +392,21 @@
TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
diff --git a/debian/rules b/debian/rules
index 0114206..cf6805c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,6 @@ override_dh_auto_build:
override_dh_auto_install:
$(MAKE) --directory=$(BUILD_TREE) install DESTDIR=$(CURDIR)/debian/tmp
- install -D -m 0755 debian/openal-config debian/tmp/usr/bin/openal-config
override_dh_strip:
dh_strip --dbg-package=libopenal1-dbg
--
Packaging for openal-soft
More information about the Pkg-games-commits
mailing list