From fd407776baf58f01e6457d0faa7bcc1df5d1c45b Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 23 Mar 2012 03:24:39 +0000 Subject: [PATCH] Add a dummy version number to the TurboJPEG dynamic library on Unix systems so Linux distro maintainers will not reject it out of hand. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@820 632fc199-4ca6-4c93-a231-07263d6284db --- ChangeLog.txt | 7 +++++++ Makefile.am | 2 +- release/libjpeg-turbo.spec.in | 2 ++ release/makemacpkg.in | 10 +++++----- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index cab96a9a..e24dc3ad 100644 --- 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 58b8f3a9..942892d7 100644 --- 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 9e0ff883..ce205343 100644 --- 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 7b43aa37..d53699d4 100644 --- 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