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

List:       kde-commits
Subject:    kdemultimedia
From:       Jean-Baptiste Mardelle <bj () altern ! org>
Date:       2004-08-26 20:33:07
Message-ID: 20040826203307.E5D1723DB () office ! kde ! org
[Download RAW message or body]

CVS commit by mardelle: 

change build system to decide if theora kfile plugin should be build


  M +8 -0      configure.in.bot   1.11
  M +25 -1     configure.in.in   1.56
  M +5 -1      kfile-plugins/Makefile.am   1.20
  M +13 -0     kfile-plugins/RETURNED_ITEMS   1.8


--- kdemultimedia/kfile-plugins/Makefile.am  #1.19:1.20
@@ -15,4 +15,8 @@
 endif
 
+if include_theora_SUBDIR
+KFILE_THEORA_SUBDIR=theora
+endif
+
 SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \
-        $(KFILE_FLAC_SUBDIR)
+        $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR)

--- kdemultimedia/kfile-plugins/RETURNED_ITEMS  #1.7:1.8
@@ -72,2 +72,15 @@
 Int        Frame rate  -/-  Frame rate
 String     Video codec -/-  The video codec symbol (e.g. mp42 or div3)
+
+
+theora plugin:
+===========
+
+type       key         W/A        details
+------------------------------------------------------------------------
+Int        Length      -/-  Length in seconds/minutes/hours
+Size       Resolution  -/-  Resolution in pixels
+Int        Frame rate  -/-  Frame rate
+Int        Quality     -/-  Quality of the encoding
+Int        Channels    -/-  Number of audio channels
+Int        Sample rate -/-  Sample rate of sample in Hz

--- kdemultimedia/configure.in.bot  #1.10:1.11
@@ -9,4 +9,12 @@
 fi
 
+if test "$oggv_have_theora" = ""; then
+  echo ""
+  echo "Ogg Theora support was not found."
+  echo "a KFile-plugin for displaying Ogg Theora Information"
+  echo "has been disabled from compilation."
+  all_tests=bad
+fi
+
 if test "x$arts_audiolib_found" = "xno"; then
   echo ""

--- kdemultimedia/configure.in.in  #1.55:1.56
@@ -121,9 +121,33 @@
 LDFLAGS="$ogg_save_LDFLAGS"
 CPPFLAGS="$ogg_save_CPPFLAGS"
-
 ])
 
 KDE_CHECK_OGG
 
+AC_DEFUN([KDE_CHECK_THEORA],
+[
+dnl later AC_CHECK_LIB is used, which uses ac_save_*, so don't use them
+dnl here
+theora_save_CPPFLAGS="$CPPFLAGS"
+theora_save_LDFLAGS="$LDFLAGS"
+CPPFLAGS="$CPPFLAGS $X_INCLUDES $USER_INCLUDES"
+LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+
+LDFLAGS="$theora_save_LDFLAGS"
+CPPFLAGS="$theora_save_CPPFLAGS"
+
+oggv_have_theora=1
+AC_CHECK_HEADER(theora/theora.h,
+        [USELESS_VAR=1],
+        [oggv_have_theora=""])
+
+AC_CHECK_LIB(theora, theora_info_init,
+        [USELESS_VAR=1],
+        [oggv_have_theora=""], -ltheora -lvorbis -logg)
+
+])
+
+KDE_CHECK_THEORA
+
 AC_DEFUN([KDE_CHECK_ALSA],
 [


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