summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac18
-rw-r--r--debian/control2
-rw-r--r--doc/man/en/xine-config.13
-rw-r--r--misc/libxine.pc.in12
-rw-r--r--misc/xine-config69
-rw-r--r--misc/xine-config.in123
7 files changed, 95 insertions, 134 deletions
diff --git a/ChangeLog b/ChangeLog
index b618b5099..104778708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ xine-lib (1.1.10) (unreleased)
* Unescape the filename in "#save:". This allows filenames to contain ';'
etc. without ambiguity, e.g. "#save:foo%3B1.ts" -> "foo;1.ts", but front
end authors should be careful with xine-lib older than 1.1.10.
+ * Backported xine-config & libxine.pc from 1.2.
+ Consequently, xine-config now requires pkg-config.
xine-lib (1.1.9.1) 2008-01-11
* Security fixes:
diff --git a/configure.ac b/configure.ac
index 3797f7c63..884d64e8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2392,9 +2392,14 @@ makeexpand () {
echo "$i"
}
-XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH"
-XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts"
-XINE_LOCALEDIR="${datadir}/locale"
+xinelibdir='${libdir}/xine'
+xinedatadir='${datadir}/xine'
+AC_SUBST(xinelibdir)
+AC_SUBST(xinedatadir)
+
+XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH"
+XINE_FONTDIR="\${xinedatadir}/xine/libxine$XINE_MAJOR/fonts"
+XINE_LOCALEDIR='${datadir}/locale'
XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`"
XINE_REL_PLUGINDIR="`makeexpand "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`"
XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`"
@@ -2438,16 +2443,16 @@ AC_SUBST(XINE_FONTDIR)
AC_SUBST(XINE_LOCALEDIR)
dnl Where aclocal m4 files should be installed
-XINE_ACFLAGS="-I `makeexpand "${datarootdir}/aclocal"`"
+XINE_ACFLAGS="-I ${datarootdir}/aclocal"
AC_DEFINE_UNQUOTED(XINE_ACFLAGS, "$XINE_ACFLAGS", [Path where aclocal m4 files will be.])
AC_SUBST(XINE_ACFLAGS)
dnl Where architecture independent data (e.g. logo) will/should be installed
-XINE_DATADIR="`makeexpand "${datarootdir}/xine"`"
+XINE_DATADIR="\${xinedatadir}"
AC_SUBST(XINE_DATADIR)
dnl Where scripts will/should be installed.
-eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
+XINE_SCRIPTPATH="\${xinedatadir}/scripts"
AC_SUBST(XINE_SCRIPTPATH)
@@ -2651,7 +2656,6 @@ misc/build_rpms.sh
misc/fonts/Makefile
misc/libxine.pc
misc/relchk.sh
-misc/xine-config
misc/xine-lib.spec
po/Makefile.in
src/Makefile
diff --git a/debian/control b/debian/control
index de1467cc5..a1faae54c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Standards-Version: 3.7.2
Package: libxine-dev
Architecture: any
Section: libdevel
-Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev
+Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config
Conflicts: xine-ui (<< 0.9.10), libxine2-dev
Description: the xine video player library, development packages
This contains development files (headers, documentation and the like)
diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1
index 0a2d8bcc6..accde1088 100644
--- a/doc/man/en/xine-config.1
+++ b/doc/man/en/xine-config.1
@@ -30,9 +30,6 @@ Print the compiler flags that are necessary to compile a program that uses
.B \-\-plugindir
Print the directory where \fIlibxine\fP plugins are stored/expected.
.TP 8
-.B \-\-skindir
-Print the directory in which \fIlibxine\fP skins are stored/expected.
-.TP 8
.B \-\-prefix=PREFIX
If specified, use PREFIX instead of the installation prefix that \fIxine-lib\fP
was built with when computing the output for the \-\-cflags and
diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in
index 623d2b657..a6565bad0 100644
--- a/misc/libxine.pc.in
+++ b/misc/libxine.pc.in
@@ -3,6 +3,18 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+
+xinelibdir=@xinelibdir@
+xinedatadir=@xinedatadir@
+
+acflags=@XINE_ACFLAGS@
+plugindir=@XINE_PLUGINDIR@
+scriptdir=@XINE_SCRIPTPATH@
+localedir=@XINE_LOCALEDIR@
+objcflags=@OBJCFLAGS@
+
Name: libxine
Description: The xine engine library
Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
diff --git a/misc/xine-config b/misc/xine-config
new file mode 100644
index 000000000..f5993f471
--- /dev/null
+++ b/misc/xine-config
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+#
+
+unset prefix
+unset exec_prefix
+unset args
+
+usage()
+{
+ cat <<EOF
+Usage: xine-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--version]
+ [--libs]
+ [--acflags]
+ [--cflags]
+ [--plugindir]
+ [--datadir]
+ [--scriptdir]
+ [--localedir]
+ [--objcflags]
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg="${1#--*=}" ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --prefix=*)
+ prefix="$optarg"
+ if [ "$exec_prefix" = '' ]; then
+ exec_prefix="$optarg"
+ fi
+ ;;
+ --exec-prefix=*)
+ exec_prefix="$optarg"
+ ;;
+ --prefix|--exec-prefix)
+ ;;
+ --version)
+ args="$args${args+ }--modversion"
+ ;;
+ --cflags|--libs)
+ args="$args${args+ }$1"
+ ;;
+ --acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
+ args="$args${args+ }--variable=${1#--}"
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \
+ "${exec_prefix+--define-variable=exc_prefix=}$exec_prefix" \
+ $args libxine
diff --git a/misc/xine-config.in b/misc/xine-config.in
deleted file mode 100644
index 8f25d5cc5..000000000
--- a/misc/xine-config.in
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-#
-#
-
-prefix=@XINE_CONFIG_PREFIX@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage()
-{
- cat <<EOF
-Usage: xine-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--version]
- [--libs]
- [--acflags]
- [--cflags]
- [--plugindir]
- [--datadir]
- [--scriptdir]
- [--localedir]
- [--objcflags]
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-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
- if test $exec_prefix_set = no ; then
- exec_prefix=$optarg
- fi
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- exec_prefix_set=yes
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --version)
- echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
- ;;
- --acflags)
- echo_acflags=yes
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- --plugindir)
- echo_plugindir=yes
- ;;
- --datadir)
- echo_datadir=yes
- ;;
- --scriptdir)
- echo_scriptdir=yes
- ;;
- --localedir)
- echo_localedir=yes
- ;;
- --objcflags)
- echo_objcflags=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_acflags" = "yes"; then
- echo "@XINE_ACFLAGS@"
-fi
-
-if test "$echo_cflags" = "yes"; then
- echo -I@includedir@ @PTHREAD_CFLAGS@
-fi
-
-if test "$echo_libs" = "yes"; then
- echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
-fi
-if test "$echo_plugindir" = "yes"; then
- echo "@XINE_PLUGINPATH@"
-fi
-if test "$echo_datadir" = "yes"; then
- echo "@XINE_DATADIR@"
-fi
-if test "$echo_scriptdir" = "yes"; then
- echo "@XINE_SCRIPTPATH@"
-fi
-if test "$echo_localedir" = "yes"; then
- echo "@XINE_LOCALEPATH@"
-fi
-if test "$echo_objcflags" = "yes"; then
- echo "@OBJCFLAGS@"
-fi
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 16:47:40 +0000