diff options
| -rw-r--r-- | configure.ac | 123 | ||||
| -rw-r--r-- | misc/SlackBuild.in | 14 | ||||
| -rw-r--r-- | misc/build_rpms.sh.in | 12 | ||||
| -rwxr-xr-x | misc/relchk.sh.in | 2 | ||||
| -rw-r--r-- | misc/xine-lib.spec.in | 4 | ||||
| -rwxr-xr-x | version.sh | 50 |
6 files changed, 100 insertions, 105 deletions
diff --git a/configure.ac b/configure.ac index a126ca9fd..e49ff0258 100644 --- a/configure.ac +++ b/configure.ac @@ -1,95 +1,53 @@ -dnl -dnl Configure.ac for xine -dnl +AC_PREREQ(2.59) -AC_INIT +dnl Note that autoconf/autoheader/automake cache using autom4te, so version.sh +dnl will only be run if configure.ac has changed. +m4_esyscmd([./version.sh])dnl + +AC_INIT([xine-lib], XINE_VERSION_SPEC, [xine-bugs@lists.sourceforge.net]) +AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/xine-engine/xine.c]) AC_CONFIG_LIBOBJ_DIR([lib]) +AC_CONFIG_HEADERS([config.h]) +AM_MAINTAINER_MODE -dnl -dnl Require autoconf version 2.59 -dnl -AC_PREREQ(2.59) +AH_TOP([#ifndef __XINE_LIB_CONFIG_H__ +#define __XINE_LIB_CONFIG_H__ 1 +]) +AH_BOTTOM([#ifdef ASMALIGN_1SLN +# define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t" +#else +# define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t" +#endif -dnl Making releases: -dnl XINE_SUB += 1; continue with XINE_LT_* values below -dnl -XINE_MAJOR=1 -XINE_MINOR=1 -XINE_SUB=90 +/* include internal system specific header */ +#include "os_internal.h" -#if test $XINE_SUB -eq 0 ; then -# XINE_SUBPART=""; -#else - XINE_SUBPART=".$XINE_SUB" -#fi - -dnl The libtool version numbers (XINE_LT_*); Don't even think about faking this! -dnl -dnl immediately before every release do: -dnl =================================== -dnl if (the interface is totally unchanged from previous release) -dnl XINE_LT_REVISION ++; -dnl else { /* interfaces have been added, removed or changed */ -dnl XINE_LT_REVISION = 0; -dnl XINE_LT_CURRENT ++; -dnl if (any interfaces have been _added_ since last release) -dnl XINE_LT_AGE ++; -dnl if (any interfaces have been _removed_ or _incompatibly changed_) -dnl XINE_LT_AGE = 0; -dnl } -dnl -dnl If you want to know more about what you are doing, here are some details: -dnl * XINE_LT_CURRENT is the current API version -dnl * XINE_LT_REVISION is an internal revision number which is increased when the API -dnl itself did not change -dnl * XINE_LT_AGE is the number of previous API versions still supported by this library -dnl * libtool has its own numbering scheme, because local library numbering schemes -dnl are platform dependent -dnl * in Linux, the library will be named -dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION - -XINE_LT_CURRENT=19 -XINE_LT_REVISION=0 -XINE_LT_AGE=17 - -dnl for a release tarball do "rm .cvsversion" before "make dist" -if test -f "${srcdir-.}/.cvsversion"; then - XINE_PRE="hg" -else - XINE_PRE="" -fi +#endif /* __XINE_LIB_CONFIG_H__ */ +]) +dnl Do not change these manually; they come from running ./version.sh when +dnl autoconf runs. +XINE_MAJOR=XINE_VERSION_MAJOR AC_SUBST(XINE_MAJOR) +AC_DEFINE_UNQUOTED([XINE_MAJOR], [$XINE_MAJOR], [xine major version number]) +XINE_MINOR=XINE_VERSION_MINOR AC_SUBST(XINE_MINOR) +AC_DEFINE_UNQUOTED([XINE_MINOR], [$XINE_MINOR], [xine minor version number]) +XINE_SUB=XINE_VERSION_SUB AC_SUBST(XINE_SUB) -AC_SUBST(XINE_IFACE_AGE) -AC_SUBST(XINE_BIN_AGE) - -AC_DEFINE_UNQUOTED(XINE_MAJOR, $XINE_MAJOR,[xine major version number]) -AC_DEFINE_UNQUOTED(XINE_MINOR, $XINE_MINOR,[xine minor version number]) -AC_DEFINE_UNQUOTED(XINE_SUB, $XINE_SUB, [xine sub version number]) +AC_DEFINE_UNQUOTED([XINE_SUB], [$XINE_SUB], [xine sub version number]) +XINE_LT_CURRENT=__XINE_LT_CURRENT AC_SUBST(XINE_LT_CURRENT) +XINE_LT_REVISION=__XINE_LT_REVISION AC_SUBST(XINE_LT_REVISION) +XINE_LT_AGE=__XINE_LT_AGE AC_SUBST(XINE_LT_AGE) -SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR${XINE_SUBPART}$XINE_PRE -TAR_NAME="xine-lib-"$SPEC_VERSION -dnl TAR_NAME="xine-lib-"$XINE_MAJOR-$XINE_PRE -dnl SPEC_VERSION=${XINE_MAJOR}_$XINE_PRE - -AC_SUBST(TAR_NAME) -AC_SUBST(SPEC_VERSION) - -LIBNAME=libxine$XINE_MAJOR +LIBNAME="libxine${XINE_MAJOR}" AC_SUBST(LIBNAME) - -AC_DEFINE_UNQUOTED(XINE_TEXTDOMAIN, "$LIBNAME", [catalog message text domain]) - -dnl -AM_INIT_AUTOMAKE("xine-lib", $SPEC_VERSION) -dnl AM_INIT_AUTOMAKE("xine-lib", $XINE_MAJOR-$XINE_PRE) +AC_DEFINE_UNQUOTED([XINE_TEXTDOMAIN], "$LIBNAME", [catalog message text domain]) dnl --------------------------------------------- dnl Made possible to build for another arch. @@ -100,7 +58,6 @@ AC_CANONICAL_BUILD test "$host" == "$build" && check_athlon=yes -AC_CONFIG_HEADERS([config.h]) MACOSX_UNIVERSAL_BINARIES @@ -1569,16 +1526,6 @@ dnl --------------------------------------------- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ asm (".align 3"); ]])], AC_DEFINE([ASMALIGN_1SLN], [1], [define if '.align n' means alignment to (1<<n)-byte boundaries]), :) -AH_TOP([#ifndef __XINE_CONFIG_H__ -#define __XINE_CONFIG_H__ 1 -]) -AH_BOTTOM([#ifdef ASMALIGN_1SLN -# define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t" -#else -# define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t" -#endif -#endif /* __XINE_CONFIG_H__ */ -]) dnl --------------------------------------------- dnl Some extra checks. @@ -1627,8 +1574,6 @@ AC_CHECK_FUNC(opendir, AC_MSG_ERROR([dirent is needed (opendir, readdir, ...)]) fi]) -AH_BOTTOM([/* include internal system specific header */ -#include "os_internal.h"]) dnl --------------------------------------------- diff --git a/misc/SlackBuild.in b/misc/SlackBuild.in index d356a1766..118613c6a 100644 --- a/misc/SlackBuild.in +++ b/misc/SlackBuild.in @@ -27,7 +27,7 @@ EOF # do_descr() { cat > package_descriptions << EOF -@PACKAGE@: @PACKAGE@ @SPEC_VERSION@. +@PACKAGE@: @PACKAGE@ @PACKAGE_VERSION@. @PACKAGE@: @PACKAGE@: xine-lib is the beating heart of xine (a free gpl-licensed @PACKAGE@: video player for unix-like systems) which among others provides @@ -53,12 +53,12 @@ do_build() { cd $CWD rm -rf $TMPBUILD mkdir -p $TMPBUILD - cd $TMPBUILD && tar -xzf $CWD/@TAR_NAME@.tar.gz + cd $TMPBUILD && tar -xzf $CWD/@PACKAGE_TARNAME@.tar.gz do_install_sh; - cd @TAR_NAME@ + cd @PACKAGE_TARNAME@ DIE=1 - echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@TAR_NAME@/src/xine-engine/.libs" && \ - ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@TAR_NAME@/src/xine-engine/.libs && \ + echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@PACKAGE_TARNAME@/src/xine-engine/.libs" && \ + ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@PACKAGE_TARNAME@/src/xine-engine/.libs && \ mkdir -p $PKG/install && cp $TMPBUILD/doinst.sh $PKG/install && \ cd $PKG && \ echo "n" | /sbin/makepkg $PACKAGE && \ @@ -172,7 +172,7 @@ main() { build_pentium build_k6 build_k7 - mv -f $CWD/@TAR_NAME@.tar.gz $SLCK + mv -f $CWD/@PACKAGE_TARNAME@.tar.gz $SLCK } @@ -184,7 +184,7 @@ build_arch() { mkdir -p $SLCK rm -f config.cache && ./autogen.sh && make dist $barch - mv -f $CWD/@TAR_NAME@.tar.gz $SLCK + mv -f $CWD/@PACKAGE_TARNAME@.tar.gz $SLCK } case "$1" in diff --git a/misc/build_rpms.sh.in b/misc/build_rpms.sh.in index b3ec065b1..c3096e5f0 100644 --- a/misc/build_rpms.sh.in +++ b/misc/build_rpms.sh.in @@ -44,9 +44,9 @@ export XINE_BUILD=i586-pc-linux-gnu eval $RPM_BA -mv /usr/src/redhat/SRPMS/libxine-@SPEC_VERSION@-$DATE.src.rpm ./rpms/ -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.i586.rpm -mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-devel-@SPEC_VERSION@-$DATE.i586.rpm +mv /usr/src/redhat/SRPMS/libxine-@PACKAGE_VERSION@-$DATE.src.rpm ./rpms/ +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.i586.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-devel-@PACKAGE_VERSION@-$DATE.i586.rpm echo "*****************************************************" echo @@ -61,7 +61,7 @@ export XINE_BUILD=i686-pc-linux-gnu eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.i686.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.i686.rpm echo "*****************************************************" echo @@ -76,7 +76,7 @@ export XINE_BUILD=k6-pc-linux-gnu eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.k6.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.k6.rpm echo "*****************************************************" echo @@ -91,6 +91,6 @@ export XINE_BUILD=athlon-pc-linux-gnu eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.k7.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.k7.rpm echo "Done." diff --git a/misc/relchk.sh.in b/misc/relchk.sh.in index 242a97486..09cce24b2 100755 --- a/misc/relchk.sh.in +++ b/misc/relchk.sh.in @@ -4,7 +4,7 @@ ## topdir="`pwd`" -distdir="@TAR_NAME@" +distdir="@PACKAGE_TARNAME@" log="$topdir/dist-log" logerror="$topdir/dist-errors" diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index 2b182e8ad..6c5d9b96c 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -1,6 +1,6 @@ %define shortname libxine %define name libxine2 -%define version @SPEC_VERSION@ +%define version @PACKAGE_VERSION@ %define release 0 %define major 1 @@ -642,7 +642,7 @@ libxine Soundausgabeplugin für den jack-Soundserver %endif %prep -%setup -q -n @TAR_NAME@ +%setup -q -n @PACKAGE_TARNAME@ %build export CFLAGS="${RPM_OPT_FLAGS}" diff --git a/version.sh b/version.sh new file mode 100755 index 000000000..2d9438379 --- /dev/null +++ b/version.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +# Making releases: +# 1. Increment XINE_VERSION_SUB +# 2. Remove .cvsversion before running make dist +# 3. Adjust the values of XINE_LT_CURRENT, XINE_LT_REVISION, and XINE_LT_AGE +# according to the following rules: +# +# If the interface is totally unchanged from the previous release, +# increment XINE_LT_REVISION by one. Otherwise: +# 1. XINE_LT_REVISION=0 +# 2. Increment XINE_LT_CURRENT by one. +# 3. If any interfaces have been ADDED since the last release, +# increment XINE_LT_AGE by one. If any interfaces have been +# REMOVED or incompatibly changed, XINE_LT_AGE=0 +# +# Regarding libtool versioning, here are some details, but see the info page for +# libtool for the whole story. The most important thing to keep in mind is that +# the libtool version numbers DO NOT MATCH the xine-lib version numbers, and you +# should NEVER try to make them match. +# +# XINE_LT_CURRENT the current API version +# XINE_LT_REVISION an internal revision number that is increased when the +# API does not change in any way +# XINE_LT_AGE the number of previous API versions still supported by +# this version + +XINE_VERSION_MAJOR=1 +XINE_VERSION_MINOR=1 +XINE_VERSION_SUB=90 + +XINE_LT_CURRENT=19 +XINE_LT_REVISION=0 +XINE_LT_AGE=17 + +test -f "`dirname $0`/.cvsversion" && XINE_VERSION_SUFFIX="hg" +XINE_VERSION_SPEC="${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_SUB}${XINE_VERSION_SUFFIX}" + +#### +#### You should not need to touch anything beyond this point +#### + +echo "m4_define([XINE_VERSION_MAJOR], [${XINE_VERSION_MAJOR}])dnl" +echo "m4_define([XINE_VERSION_MINOR], [${XINE_VERSION_MINOR}])dnl" +echo "m4_define([XINE_VERSION_SUB], [${XINE_VERSION_SUB}])dnl" +echo "m4_define([XINE_VERSION_SUFFIX], [${XINE_VERSION_SUFFIX}])dnl" +echo "m4_define([XINE_VERSION_SPEC], [${XINE_VERSION_SPEC}])dnl" +echo "m4_define([__XINE_LT_CURRENT], [${XINE_LT_CURRENT}])dnl" +echo "m4_define([__XINE_LT_REVISION], [${XINE_LT_REVISION}])dnl" +echo "m4_define([__XINE_LT_AGE], [${XINE_LT_AGE}])dnl" |