[droid] add libcdio dep

tools/android/depends/Makefile

@@ -10,7 +10,7 @@ SUBDIRS = \
 	libogg libvorbis libflac libid3tag libmad fribidi libmpeg2 \
 	libass libsamplerate \
 	libmodplug librtmp libxml2 yajl libmicrohttpd mysql \
-	python26 samba alsa-lib \
+	python26 samba alsa-lib libcdio \
 	boost dummy-libxbmc xbmc \
 
 .PHONY: $(BUILDTOOLS) $(SUBDIRS)

tools/android/depends/libcdio/Makefile

@@ -11,7 +11,9 @@ BASE_URL=http://ftp.gnu.org/gnu/libcdio
 # configuration settings
 CONFIGURE=cp -f $(PREFIX)/share/automake-1.11/config.sub $(PREFIX)/share/automake-1.11/config.guess .; \
           ./configure --prefix=$(PREFIX) --host=$(HOST)  --without-cd-drive --without-cd-info --without-cd-paranoia \
-          --without-cdda-player --without-cd-read --without-iso-info --without-iso-read 
+          --without-cdda-player --without-cd-read --without-iso-info --without-iso-read --disable-example-progs \
+          --disable-cpp-progs --without-cd-drive --without-cd-info --without-cd-paranoia --without-cdda-player \
+          --without-cd-read --without-iso-info --without-iso-read
 
 LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).so
 
@@ -26,6 +28,8 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	rm -rf $(PLATFORM)/*; mkdir $(PLATFORM)
 	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	echo $(PLATFORM) > .gitignore
+	cd $(PLATFORM); patch -p0 < ../configure.patch
+	cd $(PLATFORM); autoreconf -vif
 	cd $(PLATFORM); $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)
@@ -34,6 +38,32 @@ $(LIBDYLIB): $(PLATFORM)
 .installed:
 	make -C $(PLATFORM) install
 	cp $(PLATFORM)/include/cdio/cdtext.h $(PREFIX)/include/cdio/
+
+	mv $(PREFIX)/lib/libcdio.so.12.0.0 $(PREFIX)/lib/libcdio.so
+	rpl -e "libcdio.so.12" "libcdio.so\x00\x00\x00" $(PREFIX)/lib/libcdio.so
+
+	mv $(PREFIX)/lib/libudf.so.0.0.0 $(PREFIX)/lib/libudf.so
+	rpl -e "libudf.so.0" "libudf.so\x00\x00" $(PREFIX)/lib/libudf.so
+	rpl -e "libcdio.so.12" "libcdio.so\x00\x00\x00" $(PREFIX)/lib/libudf.so
+
+	mv $(PREFIX)/lib/libcdio++.so.0.0.2 $(PREFIX)/lib/libcdio++.so
+	rpl -e "libcdio++.so.0" "libcdio++.so\x00\x00" $(PREFIX)/lib/libcdio++.so
+	rpl -e "libcdio.so.12" "libcdio.so\x00\x00\x00" $(PREFIX)/lib/libcdio++.so
+
+	mv $(PREFIX)/lib/libiso9660.so.7.0.0 $(PREFIX)/lib/libiso9660.so
+	rpl -e "libiso9660.so.7" "libiso9660.so\x00\x00" $(PREFIX)/lib/libiso9660.so
+	rpl -e "libcdio.so.12" "libcdio.so\x00\x00\x00" $(PREFIX)/lib/libiso9660.so
+
+	mv $(PREFIX)/lib/libiso9660++.so.0.0.0 $(PREFIX)/lib/libiso9660++.so
+	rpl -e "libiso9660++.so.0" "libiso9660++.so\x00\x00" $(PREFIX)/lib/libiso9660++.so
+	rpl -e "libcdio.so.12" "libcdio.so\x00\x00\x00" $(PREFIX)/lib/libiso9660++.so
+	rpl -e "libiso9660.so.7" "libiso9660.so\x00\x00" $(PREFIX)/lib/libiso9660++.so
+
+	readelf --dynamic $(PREFIX)/lib/libcdio.so | grep ibrary
+	readelf --dynamic $(PREFIX)/lib/libudf.so | grep ibrary
+	readelf --dynamic $(PREFIX)/lib/libcdio++.so | grep ibrary
+	readelf --dynamic $(PREFIX)/lib/libiso9660.so | grep ibrary
+	readelf --dynamic $(PREFIX)/lib/libiso9660++.so | grep ibrary
 	touch $@
 
 clean:

tools/android/depends/libcdio/configure.patch

@@ -0,0 +1,11 @@
+--- configure.ac	2012-05-27 15:06:13.044747493 -0400
++++ configure.ac	2012-05-27 15:05:52.364747505 -0400
+@@ -378,7 +378,7 @@
+      ;;
+      linux*|uclinux)
+         AC_CHECK_HEADERS(linux/version.h linux/major.h)
+-        AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"])
++        AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="no"])
+ 	if test "x$have_linux_cdrom_h" = "xyes" ; then
+ 	   AC_TRY_COMPILE(,[
+ #include <linux/cdrom.h>

tools/android/packaging/Makefile

@@ -8,7 +8,8 @@ OBJS = libgcrypt.so libgpg-error.so libfontconfig.so libfreetype.so \
   libpcrecpp.so libsamplerate.so libxbcrypto.so \
   libyajl.so libxbssl.so libcurl.so \
   libtiff.so libxbjpeg.so librtmp.so libmad.so libmicrohttpd.so \
-  libsmbclient.so libxbasound.so
+  libsmbclient.so libxbasound.so libcdio.so libudf.so libcdio++.so \
+  libiso9660.so libiso9660++.so
 
 XBMCROOT = $(CURDIR)/../../..
 COPYDIRS = system addons language media