diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | doc/internal/HOWTO.release | 2 | ||||
| -rwxr-xr-x | misc/make_release.sh | 2 | ||||
| -rw-r--r-- | src/video_out/macosx/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 3 |
6 files changed, 24 insertions, 21 deletions
@@ -1,5 +1,7 @@ xine-lib (1.0.1) * fixed builds with Xv or the entire X11 unavailble + * updated internal copies of VCD libraries to libcdio 0.71 and vcdimager 0.7.21 + * fixed compatibility with new libtool versions [bug #1094262] xine-lib (1.0) * unbreak DXR3 plugin diff --git a/configure.ac b/configure.ac index b6cf23516..ccaf4733b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ dnl AC_PREREQ(2.53) dnl Making releases: -dnl XINE_SUB += 1; continue with LT_* values below +dnl XINE_SUB += 1; continue with XINE_LT_* values below dnl XINE_MAJOR=1 XINE_MINOR=0 @@ -24,34 +24,34 @@ else XINE_SUBPART=".$XINE_SUB" fi -dnl The libtool version numbers (LT_*); Don't even think about faking this! +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 LT_REVISION ++; +dnl XINE_LT_REVISION ++; dnl else { /* interfaces have been added, removed or changed */ -dnl LT_REVISION = 0; -dnl LT_CURRENT ++; +dnl XINE_LT_REVISION = 0; +dnl XINE_LT_CURRENT ++; dnl if (any interfaces have been _added_ since last release) -dnl AGE ++; +dnl XINE_LT_AGE ++; dnl if (any interfaces have been _removed_ or _incompatibly changed_) -dnl AGE = 0; +dnl XINE_LT_AGE = 0; dnl } dnl dnl If you want to know more about what you are doing, here are some details: -dnl * LT_CURRENT is the current API version -dnl * LT_REVISION is an internal revision number which is increased when the API +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 * LT_AGE is the number of previous API versions still supported by this library +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.(LT_CURRENT - LT_AGE).LT_AGE.LT_REVISION +dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION -LT_CURRENT=12 -LT_REVISION=1 -LT_AGE=11 +XINE_LT_CURRENT=12 +XINE_LT_REVISION=1 +XINE_LT_AGE=11 dnl for a release tarball do "rm .cvsversion" before "make dist" if test -f .cvsversion; then @@ -70,9 +70,9 @@ 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_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) +AC_SUBST(XINE_LT_CURRENT) +AC_SUBST(XINE_LT_REVISION) +AC_SUBST(XINE_LT_AGE) SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR${XINE_SUBPART}$XINE_PRE TAR_NAME="xine-lib-"$SPEC_VERSION diff --git a/doc/internal/HOWTO.release b/doc/internal/HOWTO.release index 977ac208d..8b7077691 100644 --- a/doc/internal/HOWTO.release +++ b/doc/internal/HOWTO.release @@ -66,7 +66,7 @@ Currently, best practice to get a release out looks like this: ask for help, so this doesn't take the whole day... Then, edit configure.ac: - set XINE_MAJOR, XINE_MINOR, XINE_SUB according to the marketing version - - set the LT_* constants according to the comments. DO _NOT_ mess with + - set the XINE_LT_* constants according to the comments. DO _NOT_ mess with these! If you're not sure about changed/added interfaces diff include/xine.h against the previous release and/or ask! diff --git a/misc/make_release.sh b/misc/make_release.sh index b1c63aa72..15a0048ad 100755 --- a/misc/make_release.sh +++ b/misc/make_release.sh @@ -188,7 +188,7 @@ if [ "$new_ver" = "$lastver" ]; then echo "According to configure.in, the new release is $new_ver, which is" echo "exactly the same as the last release." echo "Please update version info (XINE_{MAJOR,MINOR,SUB} as well as the" - echo "libtool version info (LT_{CURRENT,REVISION,AGE}) and try again!" + echo "libtool version info (XINE_LT_{CURRENT,REVISION,AGE}) and try again!" exit 1 fi diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am index 7ad2f811d..76968ceab 100644 --- a/src/video_out/macosx/Makefile.am +++ b/src/video_out/macosx/Makefile.am @@ -15,7 +15,7 @@ libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m # The "-Wl,-framework -Wl,..." is needed for libtool versions before # 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) libxineMacOSXVideo_la_LDFLAGS = -version-info \ - $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ -Wl,-framework -Wl,Cocoa -framework Cocoa \ -Wl,-framework -Wl,OpenGL -framework OpenGL libxine_MacOSXVideo_la_OBJCFLAGS = $(OBJCFLAGS) diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 9ae4363ce..af4e06dff 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -40,7 +40,8 @@ libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ $(dirent_lib) $(LIBXINEPOSIX) $(RT_LIBS) libxine_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags) + -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ + $(def_ldflags) include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ |