Ticket #21007: mp4v2-1.9.1-libversion.patch

File mp4v2-1.9.1-libversion.patch, 1.8 KB (added by holin@…, 15 years ago)

fix libtool versioning conflict

  • GNUmakefile.in 

    diff -Nru ../mp4v2-1.9.1-orig/GNUmakefile.in ./GNUmakefile.in
    old new  
    393393X_GCH_STATIC = @X_GCH_STATIC@
    394394X_GCH_STATIC_FLAGS = @X_GCH_STATIC_FLAGS@
    395395X_MINGW_LIBS = @X_MINGW_LIBS@
    396 X_libmp4v2_la_LDFLAGS = @X_libmp4v2_la_LDFLAGS@
    397396ac_ct_CC = @ac_ct_CC@
    398397ac_ct_CXX = @ac_ct_CXX@
    399398am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    443442lib_LTLIBRARIES = libmp4v2.la
    444443
    445444###############################################################################
    446 libmp4v2_la_LDFLAGS = -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point) $(X_libmp4v2_la_LDFLAGS)
     445libmp4v2_la_LDFLAGS = -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point)
    447446libmp4v2_la_SOURCES = src/3gp.cpp src/atom_ac3.cpp src/atom_amr.cpp \
    448447        src/atom_avc1.cpp src/atom_avcC.cpp src/atom_chpl.cpp \
    449448        src/atom_colr.cpp src/atom_d263.cpp src/atom_dac3.cpp \

  • configure 

    diff -Nru ../mp4v2-1.9.1-orig/configure ./configure
    old new  
    810810X_GCH_STATIC
    811811X_GCH_FLAGS
    812812X_GCH
    813 X_libmp4v2_la_LDFLAGS
    814813PROJECT_build
    815814PROJECT_repo_type
    816815PROJECT_repo_date
    … …  
    1414914148        CXXFLAGS="$CXXFLAGS_GGDB3"
    1415014149fi
    1415114150
    14152 ###############################################################################
    14153 # additional ldflags
    14154 ###############################################################################
    14155 
    14156 case ${host} in
    14157     *-*-darwin*)
    14158         X_libmp4v2_la_LDFLAGS='-Wl,-current_version,$(PROJECT_version_major).$(PROJECT_version_minor).$(PROJECT_version_point) -Wl,-compatibility_version,$(PROJECT_version_major).0.0'
    14159         ;;
    14160     *)
    14161         X_libmp4v2_la_LDFLAGS=
    14162         ;;
    14163 esac
    1416414151
    1416514152
    1416614153