[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    k3b_0_11_branch: kdeextragear-1/k3b
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2005-03-12 16:52:27
Message-ID: 20050312165227.4EA6C17B90 () office ! kde ! org
[Download RAW message or body]

CVS commit by trueg: 

Added very bad autoconf check for flac version.
BUGS:99981


  M +1 -0      ChangeLog   1.64.2.79
  M +19 -0     configure.in.in   1.48.2.3
  M +5 -0      src/audiodecoding/flac/k3bflacdecoder.cpp   1.12.2.3


--- kdeextragear-1/k3b/ChangeLog  #1.64.2.78:1.64.2.79
@@ -4,4 +4,5 @@
 Made multisession selection in DVD project visible.
 Fixed crash when importing session failed.
+Fixed compilation with flac 1.1.2
 
 0.11.20

--- kdeextragear-1/k3b/configure.in.in  #1.48.2.2:1.48.2.3
@@ -174,4 +174,23 @@
      AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
                 have_flac=yes,[],$all_libraries)])
+
+  # Hack to get the flac version since I was not able to handle the code from
+  # the flac guys. This is a strange usage of tr but I don't know too much about
+  # shell scripting and this works, so...
+  # BUT: this does not work if we want to use another flac version than the one \
installed +  #      where the flac binary is found!
+  K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d "." -f 1`
+  K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d "." -f 2`
+  K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d "." -f 3`
+  if test \( "$K3B_FLAC_VERSION_MAJOR" -gt 1 -o \
+        \( "$K3B_FLAC_VERSION_MAJOR" -eq 1 -a \( "$K3B_FLAC_VERSION_MINOR" -gt 1 -o \
\ +                                 \( "$K3B_FLAC_VERSION_MINOR" -eq 1 -a \
"$K3B_FLAC_VERSION_PATCHLEVEL" -gt 1 \) \ +        \) \) \); then
+        AC_DEFINE(
+                FLAC_NEWER_THAN_1_1_1, 
+                1,
+                [defined if the installed flac binary's version is bigger than or \
equal to 1.1.2] +        )
+  fi
 fi
 

--- kdeextragear-1/k3b/src/audiodecoding/flac/k3bflacdecoder.cpp  #1.12.2.2:1.12.2.3
@@ -309,5 +310,9 @@ QString K3bFLACDecoder::technicalInfo( c
   if( d->comments != 0 ) {
     if( info == i18n("Vendor") )
+#ifdef FLAC_NEWER_THAN_1_1_1
+      return QString::fromUtf8(d->comments->get_vendor_string());
+#else
       return QString::fromUtf8(d->comments->get_vendor_string().get_field());
+#endif
     else if( info == i18n("Channels") )
       return QString::number(d->channels);


[prev in list] [next in list] [prev in thread] [next in thread]