summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-03-21 17:23:10 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-04-03 03:05:11 -0500
commitdc07ea9271d8d96f9dd2528688381298015b1630 (patch)
tree9981ee15224c6ddf03b25204f8b087c66c424e31 /package
parent6d647637f84a1ece066845713c93c71e567232c1 (diff)
Revert "update to latest stable upstream"
This reverts commit f582f4a3c2a853b99640d043f66a797ff9ee0b42.
Diffstat (limited to 'package')
-rw-r--r--package/imx-lib/Makefile5
-rw-r--r--package/imx-lib/patches/patch-hdmi-cec_Makefile27
-rw-r--r--package/imx-lib/patches/patch-ipu_Makefile27
-rw-r--r--package/imx-lib/patches/patch-pxp_Makefile27
-rw-r--r--package/imx-lib/patches/patch-sim_Makefile10
5 files changed, 71 insertions, 25 deletions
diff --git a/package/imx-lib/Makefile b/package/imx-lib/Makefile
index fbd1b4fcd..15ad99b2c 100644
--- a/package/imx-lib/Makefile
+++ b/package/imx-lib/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= imx-lib
-PKG_VERSION:= 3.10.53-1.1.0
+PKG_VERSION:= 3.10.31-1.1.0-beta
PKG_RELEASE:= 1
-PKG_HASH:= 4db2c1f286f2478b8236e62de4df9d2a2c26ff727c752dc4f21e2910f4a5e5d7
+PKG_HASH:= 011eb34c6fd1b1ea9894bbe07a539c1aeee1500bc8fdd29d8ce1dc1d02f79e24
PKG_DESCR:= IMX library (Freescale)
PKG_SECTION:= libs/video
PKG_URL:= http://www.freescale.com/
@@ -24,7 +24,6 @@ TARGET_CPPFLAGS+= -I${LINUX_DIR}/drivers/mxc/security/rng/include \
-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
-idirafter $(LINUX_DIR)/include/uapi
MAKE_ENV+= PLATFORM=IMX6Q
-FAKE_FLAGS+= DEST_DIR=$(WRKINST)
CONFIG_STYLE:= manual
imx-lib-install:
diff --git a/package/imx-lib/patches/patch-hdmi-cec_Makefile b/package/imx-lib/patches/patch-hdmi-cec_Makefile
index ba404e621..020998bd6 100644
--- a/package/imx-lib/patches/patch-hdmi-cec_Makefile
+++ b/package/imx-lib/patches/patch-hdmi-cec_Makefile
@@ -1,11 +1,26 @@
---- imx-lib-3.10.53-1.1.0.orig/hdmi-cec/Makefile 2014-12-23 03:34:05.000000000 -0600
-+++ imx-lib-3.10.53-1.1.0/hdmi-cec/Makefile 2015-03-08 13:57:44.305700918 -0500
-@@ -33,7 +33,7 @@ all install :
+--- imx-lib-3.10.17-1.0.0.orig/hdmi-cec/Makefile 2014-01-16 15:27:12.000000000 +0100
++++ imx-lib-3.10.17-1.0.0/hdmi-cec/Makefile 2014-08-27 08:38:14.339600710 +0200
+@@ -21,18 +21,18 @@ endif
+ all: $(LIBNAME).so $(LIBNAME).a
+
+ install: install_headers
+- @mkdir -p $(DEST_DIR)/usr/lib
+- cp -P $(LIBNAME).* $(DEST_DIR)/usr/lib
++ @mkdir -p $(DESTDIR)/usr/lib
++ cp -P $(LIBNAME).* $(DESTDIR)/usr/lib
+
+ install_headers:
+- @mkdir -p $(DEST_DIR)/usr/include
+- cp hdmi-cec.h $(DEST_DIR)/usr/include
++ @mkdir -p $(DESTDIR)/usr/include
++ cp hdmi-cec.h $(DESTDIR)/usr/include
+ else
+ all install :
endif
%.o: %.c
-- $(CC) -D$(PLATFORM) -Wall -fPIC $(CFLAGS) -c $^ -o $@
-+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@
+- $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
++ $(CC) -D$(PLATFORM) $(CFLAGS) -fPIC -c $^ -o $@
$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS)
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
diff --git a/package/imx-lib/patches/patch-ipu_Makefile b/package/imx-lib/patches/patch-ipu_Makefile
index 639691a50..6016a1a26 100644
--- a/package/imx-lib/patches/patch-ipu_Makefile
+++ b/package/imx-lib/patches/patch-ipu_Makefile
@@ -1,11 +1,28 @@
---- imx-lib-3.10.53-1.1.0.orig/ipu/Makefile 2014-12-23 03:34:05.000000000 -0600
-+++ imx-lib-3.10.53-1.1.0/ipu/Makefile 2015-03-08 13:58:13.577700650 -0500
-@@ -38,7 +38,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER
+--- imx-lib-3.10.17-1.0.0.orig/ipu/Makefile 2014-01-16 15:27:12.000000000 +0100
++++ imx-lib-3.10.17-1.0.0/ipu/Makefile 2014-08-27 08:37:52.467524299 +0200
+@@ -17,11 +17,11 @@ ifeq ($(PLATFORM), $(findstring $(PLATFO
+ all: $(LIBNAME).so
+
+ install:
+- @mkdir -p $(DEST_DIR)/usr/lib
+- cp -P $(LIBNAME).* $(DEST_DIR)/usr/lib
+- @mkdir -p $(DEST_DIR)/usr/include
+- cp mxc_ipu_hl_lib.h $(DEST_DIR)/usr/include
+- cp ipu.h $(DEST_DIR)/usr/include
++ @mkdir -p $(DESTDIR)/usr/lib
++ cp -P $(LIBNAME).* $(DESTDIR)/usr/lib
++ @mkdir -p $(DESTDIR)/usr/include
++ cp mxc_ipu_hl_lib.h $(DESTDIR)/usr/include
++ cp ipu.h $(DESTDIR)/usr/include
+ else
+ all install:
+ @echo "Not support platform, will not complile"
+@@ -37,7 +37,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER
ifeq "$(PLATFORM)" ""
$(error "Unspecified PLATFORM variable")
endif
-- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@
-+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@
+- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
++ $(CC) -D$(PLATFORM) $(CFLAGS) -fPIC -c $^ -o $@
.PHONY: clean
clean:
diff --git a/package/imx-lib/patches/patch-pxp_Makefile b/package/imx-lib/patches/patch-pxp_Makefile
index 13bb1eddb..b38c12807 100644
--- a/package/imx-lib/patches/patch-pxp_Makefile
+++ b/package/imx-lib/patches/patch-pxp_Makefile
@@ -1,11 +1,26 @@
---- imx-lib-3.10.53-1.1.0.orig/pxp/Makefile 2014-12-23 03:34:05.000000000 -0600
-+++ imx-lib-3.10.53-1.1.0/pxp/Makefile 2015-03-08 13:57:06.325701267 -0500
-@@ -27,7 +27,7 @@ all install :
+--- imx-lib-3.10.17-1.0.0.orig/pxp/Makefile 2014-01-16 15:27:12.000000000 +0100
++++ imx-lib-3.10.17-1.0.0/pxp/Makefile 2014-08-27 08:37:26.291432836 +0200
+@@ -15,18 +15,18 @@ ifeq ($(PLATFORM), $(findstring $(PLATFO
+ all: $(LIBNAME).so $(LIBNAME).a
+
+ install: install_headers
+- @mkdir -p $(DEST_DIR)/usr/lib
+- cp -P $(LIBNAME).* $(DEST_DIR)/usr/lib
++ @mkdir -p $(DESTDIR)/usr/lib
++ cp -P $(LIBNAME).* $(DESTDIR)/usr/lib
+
+ install_headers:
+- @mkdir -p $(DEST_DIR)/usr/include
+- cp pxp_lib.h $(DEST_DIR)/usr/include
++ @mkdir -p $(DESTDIR)/usr/include
++ cp pxp_lib.h $(DESTDIR)/usr/include
+ else
+ all install :
endif
%.o: %.c
-- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@
-+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@
+- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
++ $(CC) -D$(PLATFORM) $(CFLAGS) -fPIC -c $^ -o $@
$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ $(LFLAGS) $^ -o $@ $(LDFLAGS)
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ $(LFLAGS) $^ -o $@
diff --git a/package/imx-lib/patches/patch-sim_Makefile b/package/imx-lib/patches/patch-sim_Makefile
index 786b19b66..6a592d49f 100644
--- a/package/imx-lib/patches/patch-sim_Makefile
+++ b/package/imx-lib/patches/patch-sim_Makefile
@@ -1,11 +1,11 @@
---- imx-lib-3.10.53-1.1.0.orig/sim/Makefile 2014-12-23 03:34:05.000000000 -0600
-+++ imx-lib-3.10.53-1.1.0/sim/Makefile 2015-03-08 14:09:51.269694263 -0500
-@@ -28,7 +28,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER
+--- imx-lib-3.10.17-1.0.0.orig/sim/Makefile 2014-01-16 15:27:12.000000000 +0100
++++ imx-lib-3.10.17-1.0.0/sim/Makefile 2014-08-27 08:30:04.293885958 +0200
+@@ -27,7 +27,7 @@ $(LIBNAME).so: $(LIBNAME).so.$(SONAMEVER
ln -s $< $@
%.o: %.c
-- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -fPIC $(CFLAGS) -c $^ -o $@
-+ $(CC) -D$(PLATFORM) $(CPPFLAGS) $(CFLAGS) -fPIC -c $^ -o $@
+- $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
++ $(CC) -D$(PLATFORM) $(CFLAGS) -c $^ -o $@
else
all install :