Add a dummy version number to the TurboJPEG dynamic library on Unix systems so Linux...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@820 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index cab96a9aa9e3d4540a069856ecfc081d87fdd0c4..e24dc3ad35d8f6ba75752b3664e41b9b94e62cea 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -19,6 +19,13 @@ decompression, the unused byte of the decompressed pixels was not being set to
 0xFF.  This has been fixed.  TJUnitTest has also been extended to test for the
 correct behavior of the colorspace extensions when merged upsampling is used.
 
+[5] The TurboJPEG dynamic library is now versioned.  It was not strictly
+necessary to do so, because TurboJPEG uses versioned symbols, and if a function
+changes in an ABI-incompatible way, that function is renamed and a legacy
+function is provided to maintain backward compatibility.  However, certain
+Linux distro maintainers will blindly reject any library that is not versioned,
+so this was an attempt to make them happy.
+
 
 1.2.0
 =====

diff --git a/Makefile.am b/Makefile.am
index 58b8f3a9c3c074e2d7b6b7c2a4bb7cefb340663e..942892d7b350bccaa650eba8d76bb5004712a9a4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libjpeg.la libturbojpeg.la
 libjpeg_la_LDFLAGS = -version-info ${SO_MAJOR_VERSION}:${SO_MINOR_VERSION} -no-undefined
-libturbojpeg_la_LDFLAGS = -avoid-version -no-undefined
+libturbojpeg_la_LDFLAGS = -version-info 0:0 -no-undefined
 include_HEADERS = jerror.h jmorecfg.h jpeglib.h turbojpeg.h
 nodist_include_HEADERS = jconfig.h
 

diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in
index 9e0ff88329e054c3b5d4508a56b26d4062df73b8..ce205343fadb1cfe5f652c4e66eb96af5c64df7d 100644 (file)
--- a/release/libjpeg-turbo.spec.in
+++ b/release/libjpeg-turbo.spec.in
@@ -90,6 +90,8 @@ rm -rf $RPM_BUILD_ROOT
 /opt/%{name}/%{__lib}/libjpeg.so
 /opt/%{name}/%{__lib}/libjpeg.a
 /opt/%{name}/%{__lib}/libturbojpeg.a
+/usr/%{__lib}/libturbojpeg.so.0.0.0
+/usr/%{__lib}/libturbojpeg.so.0
 /usr/%{__lib}/libturbojpeg.so
 /usr/%{__lib}/libturbojpeg.a
 /usr/include/turbojpeg.h

diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index 7b43aa3793f0cffe28222ccdd26aa634ba6c51bf..d53699d4e3814ebd46b72842e4b5f9eb162727fc 100644 (file)
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -113,9 +113,9 @@ if [ $BUILD32 = 1 ]; then
                -arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a \
                -output $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.a
        lipo -create \
-               -arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libturbojpeg.dylib \
-               -arch x86_64 $PKGROOT/usr/lib/libturbojpeg.dylib \
-               -output $PKGROOT/usr/lib/libturbojpeg.dylib
+               -arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libturbojpeg.0.dylib \
+               -arch x86_64 $PKGROOT/usr/lib/libturbojpeg.0.dylib \
+               -output $PKGROOT/usr/lib/libturbojpeg.0.dylib
        lipo -create \
                -arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/lib/libturbojpeg.a \
                -arch x86_64 $PKGROOT/usr/lib/libturbojpeg.a \
@@ -194,12 +194,12 @@ if [ $BUILDARMV7 = 1 ]; then
 fi
 
 install_name_tool -id /opt/$PACKAGE_NAME/lib/libjpeg.@SO_MAJOR_VERSION@.dylib $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.@SO_MAJOR_VERSION@.dylib
-install_name_tool -id libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.dylib
+install_name_tool -id libturbojpeg.0.dylib $PKGROOT/usr/lib/libturbojpeg.0.dylib
 
 ln -fs /usr/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/
 ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/
 if [ $WITH_JAVA = 1 ]; then
-       ln -fs libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.jnilib
+       ln -fs libturbojpeg.0.dylib $PKGROOT/usr/lib/libturbojpeg.jnilib
 fi
 if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib32 ]; then
        ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32