Packman Build Service PMBS

gogglesmm.changes Changed

gogglesmm.spec Changed

gogglesmm-0.12.5.tar.bz2/ChangeLog -> gogglesmm-0.12.6.tar.bz2/ChangeLog Changed

gogglesmm-0.12.5.tar.bz2/build/functions -> gogglesmm-0.12.6.tar.bz2/build/functions Changed

gogglesmm-0.12.5.tar.bz2/build/version -> gogglesmm-0.12.6.tar.bz2/build/version Changed

gogglesmm-0.12.5.tar.bz2/configure -> gogglesmm-0.12.6.tar.bz2/configure Changed

@@ -68,6 +68,7 @@
       ;;
     --xine-prefix=*)
       XINE_PREFIX=${arg#*=}
+      add_package_path $XINE_PREFIX
       ;;
     --sqlite-prefix=*)
       SQLITE_PREFIX=${arg#*=}
@@ -190,6 +191,40 @@
   EXTRALIBS="$EXTRALIBS -lGL -lGLU"
 fi
 
+# xine >= 1.2.0 use pkg-config
+add_package "libxine" "libxine"
+if  $? -eq 0  ; then
+
+  # Old xine is still supported...
+  XINE_MAJOR=${XINE_MAJOR:-1}
+  XINE_MINOR=${XINE_MINOR:-1}
+  XINE_LEVEL=${XINE_LEVEL:-16}
+  if  -n "$XINE_PREFIX"  ; then
+    check_in_prefix "XINE" $XINE_PREFIX "xine-config" $XINE_MAJOR $XINE_MINOR $XINE_LEVEL
+    if  $? -eq 0  ; then
+      echo " Unable to find a compatible XINE library installation. Please make"
+      echo " sure the correct version is installed including the header files."
+      echo " You can use the \"--xine-prefix\" option to search in an"
+      echo " alternative installation directory."
+      exit -1
+    fi
+  else
+    check_in_prefix "XINE" "/usr" "xine-config" $XINE_MAJOR $XINE_MINOR $XINE_LEVEL
+    if  $? -eq 0  ; then
+      check_in_prefix "XINE" "/usr/local" "xine-config" $XINE_MAJOR $XINE_MINOR $XINE_LEVEL
+      if  $? -eq 0  ; then
+          echo " Unable to find a compatible XINE library installation. Please make"
+          echo " sure the correct version is installed including the header files."
+          echo " You can use the \"--xine-prefix\" option to search in an"
+          echo " alternative installation directory."
+          exit -1
+      fi
+    fi
+  fi
+  add_config "libxine"
+fi
+
+
 PKG_LDFLAGS=$(pkg-config --libs-only-L $PACKAGES)
 PKG_LIBS=$(pkg-config --libs-only-l --libs-only-other $PACKAGES)
 PKG_CFLAGS=$(pkg-config --cflags-only-other $PACKAGES)
@@ -202,33 +237,6 @@
 
 
 
-XINE_MAJOR=${XINE_MAJOR:-1}
-XINE_MINOR=${XINE_MINOR:-1}
-XINE_LEVEL=${XINE_LEVEL:-16}
-if  -n "$XINE_PREFIX"  ; then
-  check_in_prefix "XINE" $XINE_PREFIX "xine-config" $XINE_MAJOR $XINE_MINOR $XINE_LEVEL
-  if  $? -eq 0  ; then
-    echo " Unable to find a compatible XINE library installation. Please make"
-    echo " sure the correct version is installed including the header files."
-    echo " You can use the \"--xine-prefix\" option to search in an"
-    echo " alternative installation directory."
-    exit -1
-  fi
-else
-  check_in_prefix "XINE" "/usr" "xine-config" $XINE_MAJOR $XINE_MINOR $XINE_LEVEL
-  if  $? -eq 0  ; then
-    check_in_prefix "XINE" "/usr/local" "xine-config" $XINE_MAJOR $XINE_MINOR $XINE_LEVEL
-    if  $? -eq 0  ; then
-        echo " Unable to find a compatible XINE library installation. Please make"
-        echo " sure the correct version is installed including the header files."
-        echo " You can use the \"--xine-prefix\" option to search in an"
-        echo " alternative installation directory."
-        exit -1
-    fi
-  fi
-fi
-add_config "xine_lib"
-
 . build/byteorderdetect
 
 if  $NLS -eq 1  ; then

Changes of Revision 9