|
 |
95f9e49 |
diff -Nru libgpod-0.6.0.orig/configure libgpod-0.6.0/configure
|
|
|
95f9e49 |
--- libgpod-0.6.0.orig/configure 2007-11-10 12:16:17.000000000 +0100
|
|
|
95f9e49 |
+++ libgpod-0.6.0/configure 2008-06-30 19:18:34.000000000 +0200
|
|
|
95f9e49 |
@@ -20204,13 +20204,13 @@
|
|
|
95f9e49 |
eval echo $libdir
|
|
|
95f9e49 |
)`
|
|
|
95f9e49 |
|
|
|
95f9e49 |
-{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
|
|
|
95f9e49 |
-echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils... $ECHO_C" >&6; }
|
|
|
95f9e49 |
+{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
|
|
|
95f9e49 |
+echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils2... $ECHO_C" >&6; }
|
|
|
95f9e49 |
if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
|
|
|
95f9e49 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
95f9e49 |
else
|
|
|
95f9e49 |
ac_check_lib_save_LIBS=$LIBS
|
|
|
95f9e49 |
-LIBS="-lsgutils $LIBS"
|
|
|
95f9e49 |
+LIBS="-lsgutils2 $LIBS"
|
|
|
95f9e49 |
cat >conftest.$ac_ext <<_ACEOF
|
|
|
95f9e49 |
/* confdefs.h. */
|
|
|
95f9e49 |
_ACEOF
|
|
|
95f9e49 |
@@ -20266,7 +20266,7 @@
|
|
|
95f9e49 |
{ echo "$as_me:$LINENO: result: $ac_cv_lib_sgutils_sg_ll_inquiry" >&5
|
|
|
95f9e49 |
echo "${ECHO_T}$ac_cv_lib_sgutils_sg_ll_inquiry" >&6; }
|
|
|
95f9e49 |
if test $ac_cv_lib_sgutils_sg_ll_inquiry = yes; then
|
|
|
95f9e49 |
- SGUTILS_LIBS="-lsgutils"; have_sgutils=yes
|
|
|
95f9e49 |
+ SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes
|
|
|
95f9e49 |
else
|
|
|
95f9e49 |
have_sgutils=no
|
|
|
95f9e49 |
fi
|
|
|
95f9e49 |
diff -Nru libgpod-0.6.0.orig/configure.ac libgpod-0.6.0/configure.ac
|
|
|
95f9e49 |
--- libgpod-0.6.0.orig/configure.ac 2007-11-06 21:03:35.000000000 +0100
|
|
|
95f9e49 |
+++ libgpod-0.6.0/configure.ac 2008-06-30 19:17:50.000000000 +0200
|
|
|
95f9e49 |
@@ -78,8 +78,8 @@
|
|
|
95f9e49 |
dnl **************************************************
|
|
|
95f9e49 |
dnl * sgutils is necessary to get the xml device file from the ipod
|
|
|
95f9e49 |
dnl **************************************************
|
|
|
95f9e49 |
-AC_CHECK_LIB(sgutils, sg_ll_inquiry,
|
|
|
95f9e49 |
- [SGUTILS_LIBS="-lsgutils"; have_sgutils=yes],
|
|
|
95f9e49 |
+AC_CHECK_LIB(sgutils2, sg_ll_inquiry,
|
|
|
95f9e49 |
+ [SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes],
|
|
|
95f9e49 |
have_sgutils=no)
|
|
|
95f9e49 |
AC_SUBST(SGUTILS_LIBS)
|
|
|
95f9e49 |
AM_CONDITIONAL(HAVE_SGUTILS, test x"$have_sgutils" = xyes)
|
|
|
95f9e49 |
diff -Nru libgpod-0.6.0.orig/tools/ipod-scsi-inquiry.c libgpod-0.6.0/tools/ipod-scsi-inquiry.c
|
|
|
95f9e49 |
--- libgpod-0.6.0.orig/tools/ipod-scsi-inquiry.c 2007-11-10 10:40:27.000000000 +0100
|
|
|
95f9e49 |
+++ libgpod-0.6.0/tools/ipod-scsi-inquiry.c 2008-06-30 19:32:36.000000000 +0200
|
|
|
95f9e49 |
@@ -30,6 +30,7 @@
|
|
|
95f9e49 |
#include <fcntl.h>
|
|
|
95f9e49 |
#include <stdio.h>
|
|
|
95f9e49 |
#include <stdlib.h>
|
|
|
95f9e49 |
+#include <stdint.h>
|
|
|
95f9e49 |
#include <string.h>
|
|
|
95f9e49 |
#include <unistd.h>
|
|
|
95f9e49 |
#include <scsi/sg_cmds.h>
|