[cec] take 3, and now with the correct directory in the source tarball

diff --git a/tools/android/depends/libcec/Makefile b/tools/android/depends/libcec/Makefile
index 7a92566..5d78aff 100644 (file)
--- a/tools/android/depends/libcec/Makefile
+++ b/tools/android/depends/libcec/Makefile
@@ -1,9 +1,9 @@
 include ../Makefile.include
-DEPS= ../Makefile.include android.patch Makefile
+DEPS= ../Makefile.include Makefile
 
 # lib name, version
 LIBNAME=libcec
-VERSION=2.0.5-2
+VERSION=2.0.5-3
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
@@ -21,7 +21,6 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
        rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
        $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-       cd $(PLATFORM); patch -p1 < ../android.patch
        cd $(PLATFORM); $(AUTORECONF) -vif
        cd $(PLATFORM); $(CONFIGURE)
 

diff --git a/tools/android/depends/libcec/android.patch b/tools/android/depends/libcec/android.patch
deleted file mode 100644 (file)
index 200c5a1..0000000
--- a/tools/android/depends/libcec/android.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- armeabi-v7a/configure.ac   2012-06-04 00:15:13.054345341 -0400
-+++ armeabi-v7a-good/configure.ac      2012-06-04 00:15:28.624345331 -0400
-@@ -8,7 +8,6 @@
- case "${host}" in
-   *-*-linux*)
-     PKG_CHECK_MODULES([UDEV],[libudev],,[has_libudev="no";AC_MSG_WARN("library 'udev' is missing - adapter detection will not be available")])
--    LIBS+=" -lrt"
-     ;;
-   *-apple-darwin*)
-     has_libudev="no";

diff --git a/tools/darwin/depends/libcec/Makefile b/tools/darwin/depends/libcec/Makefile
index 41d9b7e..3e84bff 100644 (file)
--- a/tools/darwin/depends/libcec/Makefile
+++ b/tools/darwin/depends/libcec/Makefile
@@ -3,14 +3,14 @@ include ../config.site.mk
 
 # lib name, version
 LIBNAME=libcec
-VERSION=2.0.5-2
+VERSION=2.0.5-3
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX)
 
-LIBDYLIB=$(SOURCE)/src/lib/.libs/$(LIBNAME).1.dylib
+LIBDYLIB=$(SOURCE)/src/lib/.libs/$(LIBNAME).2.dylib
 
 all: $(LIBDYLIB) .installed
 
@@ -34,6 +34,6 @@ $(LIBDYLIB): $(SOURCE)
 clean:
        rm -rf $(SOURCE) .installed
 
-distclean::
+distclean:
        rm -rf $(SOURCE) .installed