From 13d765ca841b06759ffcabbd606b4b01e4c1524e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 22 Jan 2008 02:29:02 +0000 Subject: Patch version missing from xine-config, libxine.pc The possible patch digit is missing from "xine-lib --version" and "pkg-config --modversion libxine", as witnessed in 1.1.9.1. --HG-- extra : transplant_source : %3C%0E%E4%28%F3%AD%C5%7F%8F%13%D7%1Ck%10tAQ%85Oh --- misc/libxine.pc.in | 2 +- misc/xine-config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'misc') diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index c27e8aa94..623d2b657 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libxine Description: The xine engine library -Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ +Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@ Requires: Libs: -L${libdir} -lxine Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ diff --git a/misc/xine-config.in b/misc/xine-config.in index 8d288b22b..8f25d5cc5 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -54,7 +54,7 @@ while test $# -gt 0; do echo_exec_prefix=yes ;; --version) - echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ + echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@ ;; --acflags) echo_acflags=yes -- cgit v1.2.3 From 87d72726273d21a3e61b68968c0be68762dc1ccb Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 23 Jan 2008 00:37:33 +0000 Subject: Finish the backport of libxine.pc.in; do xine-config (now requires pkg-config). Remove the "deprecated" warnings since xine-config is not deprecated in 1.1.x. --skindir no longer works. --HG-- rename : misc/xine-config.in => misc/xine-config --- misc/libxine.pc.in | 12 +++++ misc/xine-config | 69 +++++++++++++++++++++++++++++ misc/xine-config.in | 123 ---------------------------------------------------- 3 files changed, 81 insertions(+), 123 deletions(-) create mode 100644 misc/xine-config delete mode 100644 misc/xine-config.in (limited to 'misc') 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 <&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 <&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 -- cgit v1.2.3 From a5203938aa08ae901dc0383848afe13272d345d6 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 23 Jan 2008 00:45:13 +0000 Subject: Fix xine-config bugs related to --prefix & --exec-prefix. Output the values, and correctly set exec_prefix. --- misc/xine-config | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/xine-config b/misc/xine-config index f5993f471..3e67e5dc7 100644 --- a/misc/xine-config +++ b/misc/xine-config @@ -42,11 +42,11 @@ while test $# -gt 0; do if [ "$exec_prefix" = '' ]; then exec_prefix="$optarg" fi + args="$args${args+ }--variable=prefix" ;; --exec-prefix=*) exec_prefix="$optarg" - ;; - --prefix|--exec-prefix) + args="$args${args+ }--variable=exec_prefix" ;; --version) args="$args${args+ }--modversion" @@ -54,9 +54,12 @@ while test $# -gt 0; do --cflags|--libs) args="$args${args+ }$1" ;; - --acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags) + --prefix|--acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags) args="$args${args+ }--variable=${1#--}" ;; + --exec-prefix) + args="$args${args+ }--variable=exec_prefix" + ;; *) usage 1 1>&2 ;; @@ -65,5 +68,5 @@ while test $# -gt 0; do done exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \ - "${exec_prefix+--define-variable=exc_prefix=}$exec_prefix" \ + "${exec_prefix+--define-variable=exec_prefix=}$exec_prefix" \ $args libxine -- cgit v1.2.3