3 files changed, 41 insertions, 4 deletions
diff --git a/system/cdemu-daemon/cdemu-daemon-1.1.0-cdemud-daemon.diff b/system/cdemu-daemon/cdemu-daemon-1.1.0-cdemud-daemon.diff
new file mode 100644
index 0000000000000..aeabac7cd1f94
--- /dev/null
+++ b/system/cdemu-daemon/cdemu-daemon-1.1.0-cdemud-daemon.diff
@@ -0,0 +1,30 @@
+--- trunk/cdemu-daemon/src/cdemud-daemon.c	2008/07/25 20:39:19	406
++++ trunk/cdemu-daemon/src/cdemud-daemon.c	2008/07/25 20:39:47	407
+@@ -30,19 +30,19 @@
+ #define BUF_SIZE (512 * (MAX_SECTORS + OTHER_SECTORS))
+ 
+ struct vhba_request {
+-    __u32 tag;
+-    __u32 lun;
++    guint32 tag;
++    guint32 lun;
+ #define MAX_COMMAND_SIZE       16
+ 
+-    __u8 cdb[MAX_COMMAND_SIZE];
+-    __u8 cdb_len;
+-    __u32 data_len;
++    guint8 cdb[MAX_COMMAND_SIZE];
++    guint8 cdb_len;
++    guint32 data_len;
+ };
+ 
+ struct vhba_response {
+-    __u32 tag;
+-    __u32 status;
+-    __u32 data_len;
++    guint32 tag;
++    guint32 status;
++    guint32 data_len;
+ };
+ 
+ 
diff --git a/system/cdemu-daemon/cdemu-daemon.SlackBuild b/system/cdemu-daemon/cdemu-daemon.SlackBuild
index 10df638abb37f..89f3205b4cece 100644
--- a/system/cdemu-daemon/cdemu-daemon.SlackBuild
+++ b/system/cdemu-daemon/cdemu-daemon.SlackBuild
@@ -37,10 +37,13 @@ GROUP=${GROUP:-cdrom}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -54,15 +57,17 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 
+patch -p2 -i $CWD/cdemu-daemon-1.1.0-cdemud-daemon.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -96,7 +101,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
 
 if [ "$1" = "--cleanup" ]; then
 	 rm -rf $PKG $TMP/$PRGNAM-$VERSION
diff --git a/system/cdemu-daemon/cdemu-daemon.info b/system/cdemu-daemon/cdemu-daemon.info
index 3717608616b98..1637f3bccdba1 100644
--- a/system/cdemu-daemon/cdemu-daemon.info
+++ b/system/cdemu-daemon/cdemu-daemon.info
@@ -2,7 +2,9 @@ PRGNAM="cdemu-daemon"
 VERSION="1.1.0"
 HOMEPAGE="http://cdemu.sourceforge.net/pkg_daemon.php"
 DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-1.1.0.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="0118e5f590d7c0e1b02027b718880ac6"
+MD5SUM_x86_64=""
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="nille.kungen[AT]gmail.com"
-APPROVED="dsomero rworkman"
+APPROVED="dsomero,rworkman,pprkut"