File exo-0.3.4-oldhal.patch of Package exo

Overview Repositories Revisions Requests Users Attributes Meta

File exo-0.3.4-oldhal.patch of Package exo

--- configure
+++ configure
@@ -25264,7 +25264,7 @@
 
 
   if test x"$xdt_cv_HAL_check" = x"yes"; then
-    if $PKG_CONFIG --exists "hal-storage >= 0.5.7" >/dev/null 2>&1; then
+    if $PKG_CONFIG --exists "hal-storage >= 0.5.6" >/dev/null 2>&1; then
 
 
   # minimum supported version of pkg-config
@@ -25348,9 +25348,9 @@
   fi
 
 
-  { echo "$as_me:$LINENO: checking for hal-storage >= 0.5.7" >&5
-echo $ECHO_N "checking for hal-storage >= 0.5.7... $ECHO_C" >&6; }
-  if $PKG_CONFIG "--atleast-version=0.5.7" "hal-storage" >/dev/null 2>&1; then
+  { echo "$as_me:$LINENO: checking for hal-storage >= 0.5.6" >&5
+echo $ECHO_N "checking for hal-storage >= 0.5.6... $ECHO_C" >&6; }
+  if $PKG_CONFIG "--atleast-version=0.5.6" "hal-storage" >/dev/null 2>&1; then
     HAL_VERSION=`$PKG_CONFIG --modversion "hal-storage"`
     { echo "$as_me:$LINENO: result: $HAL_VERSION" >&5
 echo "${ECHO_T}$HAL_VERSION" >&6; }
@@ -25367,7 +25367,7 @@
     { echo "$as_me:$LINENO: result: $HAL_LIBS" >&5
 echo "${ECHO_T}$HAL_LIBS" >&6; }
 
-    HAL_REQUIRED_VERSION=0.5.7
+    HAL_REQUIRED_VERSION=0.5.6
 
 
 
@@ -25390,7 +25390,7 @@
 
       echo "*** The required package hal-storage was found on your system,"
       echo "*** but the installed version ($xdt_cv_version) is too old."
-      echo "*** Please upgrade hal-storage to atleast version 0.5.7, or adjust"
+      echo "*** Please upgrade hal-storage to atleast version 0.5.6, or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
       echo "*** the new version of the package in a nonstandard prefix so"
       echo "*** pkg-config is able to find it."
@@ -25402,7 +25402,7 @@
 
 
       echo "*** The required package hal-storage was not found on your system."
-      echo "*** Please install hal-storage (atleast version 0.5.7) or adjust"
+      echo "*** Please install hal-storage (atleast version 0.5.6) or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you"
       echo "*** installed the package in a nonstandard prefix so that"
       echo "*** pkg-config is able to find it."
@@ -25411,8 +25411,8 @@
   fi
 
     else
-      { echo "$as_me:$LINENO: checking for optional package hal-storage >= 0.5.7" >&5
-echo $ECHO_N "checking for optional package hal-storage >= 0.5.7... $ECHO_C" >&6; }
+      { echo "$as_me:$LINENO: checking for optional package hal-storage >= 0.5.6" >&5
+echo $ECHO_N "checking for optional package hal-storage >= 0.5.6... $ECHO_C" >&6; }
       { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
     fi
--- configure.in
+++ configure.in
@@ -171,7 +171,7 @@
 dnl ********************************
 dnl *** Check for HAL (optional) ***
 dnl ********************************
-XDT_CHECK_OPTIONAL_PACKAGE([HAL], [hal-storage], [0.5.7], [hal], [HAL support], [yes])
+XDT_CHECK_OPTIONAL_PACKAGE([HAL], [hal-storage], [0.5.6], [hal], [HAL support], [yes])
 if test x"$HAL_FOUND" = x"yes"; then
   dnl # substituted into exo-hal-0.3.pc
   HAL_STORAGE_DEPENDENCY="hal-storage"
--- exo-hal/exo-hal.c
+++ exo-hal/exo-hal.c
@@ -389,6 +389,7 @@
         first = "CD-ROM";
 
       /* determine the second capability of the drive (if any) */
+#if 0
       if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_HDDVDRW) != 0)
         second = "/HD DVD-RW";
       else if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_HDDVDR) != 0)
@@ -401,7 +402,8 @@
         second = "/BD-R";
       else if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_BDROM) != 0)
         second = "/BD-ROM";
-      else if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDRW) != 0
+#endif
+      /* else */ if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDRW) != 0
             && (cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW) != 0)
         {
           if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL) != 0
@@ -724,7 +726,7 @@
                 case LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR_DL:
                   label = "DVD+R DL";
                   break;
-
+#if 0
                 case LIBHAL_VOLUME_DISC_TYPE_BDROM:
                   label = "BD-ROM";
                   break;
@@ -748,7 +750,7 @@
                 case LIBHAL_VOLUME_DISC_TYPE_HDDVDRW:
                   label = "HD DVD-RW";
                   break;
-
+#endif
                 default: /* everything else is just a CD-ROM */
                   label = "CD-ROM";
                   break;

Places

File exo-0.3.4-oldhal.patch of Package exo

Places