diff options
| author | Lars Op den Kamp <lars@opdenkamp.eu> | 2012-12-07 03:48:25 +0100 |
|---|---|---|
| committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2012-12-07 03:49:34 +0100 |
| commit | b6c44175da9364807fad1d887a573e2025017a4e (patch) | |
| tree | e43c4569dba2b187c030088355e027268886bd2d | |
| parent | a40af275f6d240a67d8b7328cd6d5dfd408f73a2 (diff) | |
[cec] take 3, and now with the correct directory in the source tarball
| -rw-r--r-- | tools/android/depends/libcec/Makefile | 5 | ||||
| -rw-r--r-- | tools/android/depends/libcec/android.patch | 10 | ||||
| -rw-r--r-- | tools/darwin/depends/libcec/Makefile | 6 |
3 files changed, 5 insertions, 16 deletions
diff --git a/tools/android/depends/libcec/Makefile b/tools/android/depends/libcec/Makefile index 7a9256640b..5d78aff176 100644 --- 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 index 200c5a1482..0000000000 --- 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 41d9b7ee72..3e84bffb0a 100644 --- 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 |