summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl/efl
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-08-03 13:09:10 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-08-14 13:34:25 +0200
commitdd708272e92d7f069c35e52145e2e489d5230c76 (patch)
tree048129e440852d003c4fe70fad4e66ba3d3ca05f /meta-efl/recipes-efl/efl
parentc11f208cb2d00666c84a0d07644c4bf8ac5adf3c (diff)
downloadmeta-openembedded-dd708272e92d7f069c35e52145e2e489d5230c76.tar.gz
meta-efl: upgrade efl to 1.7.8, e-wm to 0.17.4
* announcement: http://www.mail-archive.com/enlightenment-devel@lists.sourceforge.net/msg54004.html Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl/efl')
-rw-r--r--meta-efl/recipes-efl/efl/ecore_1.7.7.bb11
-rw-r--r--meta-efl/recipes-efl/efl/ecore_1.7.8.bb9
-rw-r--r--meta-efl/recipes-efl/efl/edbus_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/edbus_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/edje_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/edje_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/eet_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/eet_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/eeze_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/eeze_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/efreet_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/efreet_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/eina_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/eina_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/eio_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/eio_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/elementary_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/elementary_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/embryo_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/embryo_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/emotion_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/emotion_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/ethumb_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/ethumb_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/evas/revert.r83789.patch146
-rw-r--r--meta-efl/recipes-efl/efl/evas_1.7.7.bb11
-rw-r--r--meta-efl/recipes-efl/efl/evas_1.7.8.bb8
-rw-r--r--meta-efl/recipes-efl/efl/expedite_1.7.7.bb10
-rw-r--r--meta-efl/recipes-efl/efl/expedite_1.7.8.bb8
31 files changed, 121 insertions, 298 deletions
diff --git a/meta-efl/recipes-efl/efl/ecore_1.7.7.bb b/meta-efl/recipes-efl/efl/ecore_1.7.7.bb
deleted file mode 100644
index aad7a2765..000000000
--- a/meta-efl/recipes-efl/efl/ecore_1.7.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7 file://fix-ecore-fb-initialization.patch \
8"
9
10SRC_URI[md5sum] = "8974d55e80bab1405c24b73f1f43153c"
11SRC_URI[sha256sum] = "1a933394897bba8d255c3e458501be9ed30fa2a02f7552e338350f54e2342fd6"
diff --git a/meta-efl/recipes-efl/efl/ecore_1.7.8.bb b/meta-efl/recipes-efl/efl/ecore_1.7.8.bb
new file mode 100644
index 000000000..ccd5d97f4
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ecore_1.7.8.bb
@@ -0,0 +1,9 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5 file://fix-ecore-fb-initialization.patch \
6"
7
8SRC_URI[md5sum] = "5a8ca096d8c15647b2493d4664a4b895"
9SRC_URI[sha256sum] = "26cb1dc02213a221fdec32ef4ea4ece608e5239bdbd19c9d62b09cf931863738"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.7.7.bb b/meta-efl/recipes-efl/efl/edbus_1.7.7.bb
deleted file mode 100644
index f8da1fdff..000000000
--- a/meta-efl/recipes-efl/efl/edbus_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "d9bf302b9b3f6cfd98840e6e8ca8c0ce"
10SRC_URI[sha256sum] = "ad2b545d29920a3c245e7d73cced8be0fbef28cc003028fe4938961810748fef"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.7.8.bb b/meta-efl/recipes-efl/efl/edbus_1.7.8.bb
new file mode 100644
index 000000000..a9250e9b6
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edbus_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "8711070b57873b2b2a0024b198e50906"
8SRC_URI[sha256sum] = "9e94f1c522ac9faec991cd90c91e4e26b355909dbba21b42585359841937af78"
diff --git a/meta-efl/recipes-efl/efl/edje_1.7.7.bb b/meta-efl/recipes-efl/efl/edje_1.7.7.bb
deleted file mode 100644
index f68836307..000000000
--- a/meta-efl/recipes-efl/efl/edje_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "8aa82193b59aef8fc91577f1226d2daa"
10SRC_URI[sha256sum] = "ad912d56b6f3e27442d069ce1c8f1ba50b635ef5f408a9cc00912c927bed2a1e"
diff --git a/meta-efl/recipes-efl/efl/edje_1.7.8.bb b/meta-efl/recipes-efl/efl/edje_1.7.8.bb
new file mode 100644
index 000000000..ea3fc74e3
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edje_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "06399e95de312de12342df8f16c7c885"
8SRC_URI[sha256sum] = "924eae1be1fe755997be8074d32af4b6a83ed7e57057edccb2cf46b83c33202d"
diff --git a/meta-efl/recipes-efl/efl/eet_1.7.7.bb b/meta-efl/recipes-efl/efl/eet_1.7.7.bb
deleted file mode 100644
index 7c701c5e4..000000000
--- a/meta-efl/recipes-efl/efl/eet_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "a4ee8343fdb93ff00359e595f45488cd"
10SRC_URI[sha256sum] = "d3c801995d7ec1f85de0adda440c4577060e2895c4ef21da60077773d5874f1b"
diff --git a/meta-efl/recipes-efl/efl/eet_1.7.8.bb b/meta-efl/recipes-efl/efl/eet_1.7.8.bb
new file mode 100644
index 000000000..df4d7c175
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eet_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "2db9527a95412af26df8f79429ffcc95"
8SRC_URI[sha256sum] = "faad73b713c08f8f3c9ed76a0f8e4161f969e5ec8215db1dd5108d3f6eeb3a20"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.7.bb b/meta-efl/recipes-efl/efl/eeze_1.7.7.bb
deleted file mode 100644
index 27485d9ab..000000000
--- a/meta-efl/recipes-efl/efl/eeze_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "8050f8701e3176a9f880ed50bbfd33a6"
10SRC_URI[sha256sum] = "975461750b6487884bd39dbd1078cd2a1a333451a8b85c8d6bb231d87936caf4"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.8.bb b/meta-efl/recipes-efl/efl/eeze_1.7.8.bb
new file mode 100644
index 000000000..bcf1c0413
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eeze_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "3ee68667f65860a0bdb7126e555155ff"
8SRC_URI[sha256sum] = "9a4df9d086575c54d0116164d46b2c9e29362cc32398ea606c2365cbdf4157dd"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.7.bb b/meta-efl/recipes-efl/efl/efreet_1.7.7.bb
deleted file mode 100644
index a7db2fe63..000000000
--- a/meta-efl/recipes-efl/efl/efreet_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "f470cdfad747f615a25785ba18044ea6"
10SRC_URI[sha256sum] = "674177824a0dd20c29caec20b94355bafa529d15243cc1a06fe6bec1cbe7d88b"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.8.bb b/meta-efl/recipes-efl/efl/efreet_1.7.8.bb
new file mode 100644
index 000000000..d1eadb7bf
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efreet_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "42ccb6672be6c3cbd7359c9b71a8e587"
8SRC_URI[sha256sum] = "b462c6d230af00d052674e175dbd269f1a4aa0ea510f704b2118895429127426"
diff --git a/meta-efl/recipes-efl/efl/eina_1.7.7.bb b/meta-efl/recipes-efl/efl/eina_1.7.7.bb
deleted file mode 100644
index 905d8e273..000000000
--- a/meta-efl/recipes-efl/efl/eina_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "baeb29327fc017e3ced890dc822c74ef"
10SRC_URI[sha256sum] = "9812ea4c98ad4086bb93dedf04f49125c41cf3c72773f7e2a89a2e3ea62cbce4"
diff --git a/meta-efl/recipes-efl/efl/eina_1.7.8.bb b/meta-efl/recipes-efl/efl/eina_1.7.8.bb
new file mode 100644
index 000000000..04f16c4d5
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eina_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "4c7715b636f71a5e07be4f33e72c6a69"
8SRC_URI[sha256sum] = "e39c5d9cc9d0854521983fe653b8f2efe2946e74066c7c0456ffe62342535d18"
diff --git a/meta-efl/recipes-efl/efl/eio_1.7.7.bb b/meta-efl/recipes-efl/efl/eio_1.7.7.bb
deleted file mode 100644
index 2e59e63b9..000000000
--- a/meta-efl/recipes-efl/efl/eio_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "edbbe1cfd6f73de3af74b83c980ba0c8"
10SRC_URI[sha256sum] = "5bf904a6c6e79e2046d0b3f355570f754511436636d41a271aeed6890cb25194"
diff --git a/meta-efl/recipes-efl/efl/eio_1.7.8.bb b/meta-efl/recipes-efl/efl/eio_1.7.8.bb
new file mode 100644
index 000000000..9634459fc
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eio_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "a5e1608a629667de3cfd17289d599b07"
8SRC_URI[sha256sum] = "f18831389f6b735e73c74d7f411602722dc8ce214ac3f4171b59d216d842a3b0"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.7.7.bb b/meta-efl/recipes-efl/efl/elementary_1.7.7.bb
deleted file mode 100644
index da53e27a9..000000000
--- a/meta-efl/recipes-efl/efl/elementary_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "079cce349333b4831d3f56abeefa1d2d"
10SRC_URI[sha256sum] = "b7850d1f1438ba58b780320d37522bf2e9e81339ebc6b660ad9cb3ea81f6c253"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.7.8.bb b/meta-efl/recipes-efl/efl/elementary_1.7.8.bb
new file mode 100644
index 000000000..8dfe88097
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "c9d387243a1ffa9318a491315c7007c8"
8SRC_URI[sha256sum] = "b02bcc17ba9f80a1a9df456ae95584b98747a2ff14f90c9c0471a16869bd35dc"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.7.bb b/meta-efl/recipes-efl/efl/embryo_1.7.7.bb
deleted file mode 100644
index 933c3c40e..000000000
--- a/meta-efl/recipes-efl/efl/embryo_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "a4a2aa43a41afa783132a7220c450f6b"
10SRC_URI[sha256sum] = "0b5f0c7f2357f0e31b9cf797e5a606bd491d75c9f3b8e006da15d4a8c17c9225"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.8.bb b/meta-efl/recipes-efl/efl/embryo_1.7.8.bb
new file mode 100644
index 000000000..3f1e88329
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/embryo_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "8fee23d51be07c72f9a7edf707e1f43f"
8SRC_URI[sha256sum] = "fe8af458b2f3e5e561181c7e86b763e2623397a2a4bbbfe08e58be06ed052306"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.7.bb b/meta-efl/recipes-efl/efl/emotion_1.7.7.bb
deleted file mode 100644
index c680b894d..000000000
--- a/meta-efl/recipes-efl/efl/emotion_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "8b53d2d945d6a40b012472f47568879a"
10SRC_URI[sha256sum] = "aab476f80d4ad89056ba3860dfbb681c335c3688825fd587f5cbc6d9728abd41"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.8.bb b/meta-efl/recipes-efl/efl/emotion_1.7.8.bb
new file mode 100644
index 000000000..b5177d4af
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "e04679ac7967e698c8c4013b9fd209a1"
8SRC_URI[sha256sum] = "54c96192cb46f5dce851934adb1633b45e5b007ad3cd05495102eeb255bced31"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.7.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.7.bb
deleted file mode 100644
index 5e700cb7b..000000000
--- a/meta-efl/recipes-efl/efl/ethumb_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "58a1e8476dcc15ecffc8d542be656cb9"
10SRC_URI[sha256sum] = "541d07017f99b567976b2678466dbb5b540a4e93bf4fab987f3d0d612010da20"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.8.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.8.bb
new file mode 100644
index 000000000..8d7d8bde4
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ethumb_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "9c5936d06ff79aea0dd81c5be0bf511e"
8SRC_URI[sha256sum] = "9047a88122c8713444d66294b3343c07feb15817a1809c7cbc9478ba91587e2d"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.7.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.7.bb
deleted file mode 100644
index ea07ae9e0..000000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "0af7e3a5e0bf931bf87294d39eae3623"
10SRC_URI[sha256sum] = "4eef549641d26b921f564169af1f21f7854431f523897cd167d3c3c860e854aa"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.8.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.8.bb
new file mode 100644
index 000000000..de71858a2
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "8d6c7f56db854fdf931fc9270d0fda87"
8SRC_URI[sha256sum] = "4f5f2a00eb065049de3e31cd86aee7de3b0593b9aec70aeb851f4f8189233d34"
diff --git a/meta-efl/recipes-efl/efl/evas/revert.r83789.patch b/meta-efl/recipes-efl/efl/evas/revert.r83789.patch
deleted file mode 100644
index a5b8ce6c3..000000000
--- a/meta-efl/recipes-efl/efl/evas/revert.r83789.patch
+++ /dev/null
@@ -1,146 +0,0 @@
1From 134e338a40af875d5f7b221a7a8dbeefa7a48f55 Mon Sep 17 00:00:00 2001
2From: Daniel Willmann <d.willmann@samsung.com>
3Date: Tue, 07 May 2013 09:49:53 +0000
4Subject: Revert "Backport rev 83789"
5
6This reverts commit 9a7a28b7582f516c67b23c4bb1a016cfc2ec5b31.
7Was reverted long ago in efl as it doesn't actually work.
8
9Signed-off-by: Daniel Willmann <d.willmann@samsung.com>
10---
11diff --git a/ChangeLog b/ChangeLog
12index 54da44a..93d3834 100644
13--- a/ChangeLog
14+++ b/ChangeLog
15@@ -1294,3 +1294,7 @@
16
17 * Evas text: Fixed line size calculation when using multiple
18 fonts.
19+
20+2013-05-16 Daniel Wilmann
21+ * x11 backend: Revert "Fix memory usage spike when rotating with the
22+ software_x11 engine". This doesn't actually work.
23diff --git a/NEWS b/NEWS
24index 6188963..c8002db 100644
25--- a/NEWS
26+++ b/NEWS
27@@ -13,6 +13,7 @@ Fixes:
28 * Evas: If an object goes to be hidden without replacing the cur/prev state info, the object context can be corrupted at the next show time. Now it replaces the cur/prev in that rare case.
29 * Fix recursive proxy image rendering to just render black
30 * Evas text: Fixed line size calculation when using multiple fonts.
31+ * Revert "Fix memory usage spike when rotating with the software_x11 engine."
32
33 Evas 1.7.6
34 * Fix SIGFPE in evas map update if image is 0.
35diff --git a/src/modules/engines/software_x11/evas_xlib_outbuf.c b/src/modules/engines/software_x11/evas_xlib_outbuf.c
36index 3cb1ea0..e337e99 100644
37--- a/src/modules/engines/software_x11/evas_xlib_outbuf.c
38+++ b/src/modules/engines/software_x11/evas_xlib_outbuf.c
39@@ -362,7 +362,7 @@ evas_software_xlib_outbuf_setup_x(int w, int h, int rot, Outbuf_Depth depth,
40 RGBA_Image *
41 evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch)
42 {
43- RGBA_Image *im = NULL;
44+ RGBA_Image *im;
45 Outbuf_Region *obr;
46 int bpl = 0;
47 int use_shm = 1;
48@@ -455,11 +455,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w
49 }
50 else
51 {
52- /* FIXME: For the onebuf case we probably need to do the same thing we did below
53- * (try to get an existing image before we allocate a new one). This code path
54- * is not really used at the moment so no way to test (and that's why the change
55- * is not implemented here as well.
56- */
57 #ifdef EVAS_CSERVE2
58 if (evas_cserve2_use_get())
59 im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
60@@ -613,73 +608,26 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w
61 }
62 else
63 {
64- obr->xob = _find_xob(buf->priv.x11.xlib.disp,
65- buf->priv.x11.xlib.vis,
66- buf->priv.x11.xlib.depth,
67- w, h,
68- use_shm,
69- NULL);
70 #ifdef EVAS_CSERVE2
71 if (evas_cserve2_use_get())
72- {
73- if (obr->xob)
74- im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(),
75- w, h,
76- (DATA32 *) evas_software_xlib_x_output_buffer_data(obr->xob, &bpl),
77- alpha, EVAS_COLORSPACE_ARGB8888);
78-
79- if (!im)
80- {
81- if (obr->xob) _unfind_xob(obr->xob, 0);
82- im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
83- if (!im)
84- {
85- free(obr);
86- return NULL;
87- }
88- else
89- {
90- im->cache_entry.w = w;
91- im->cache_entry.h = h;
92- im->cache_entry.flags.alpha |= alpha ? 1 : 0;
93- evas_cache2_image_surface_alloc(&im->cache_entry, w, h);
94- }
95- }
96- }
97+ im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
98 else
99 #endif
100+ im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
101+ if (!im)
102 {
103- if (obr->xob)
104- im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
105- w, h,
106- (DATA32 *) evas_software_xlib_x_output_buffer_data(obr->xob, &bpl),
107- alpha, EVAS_COLORSPACE_ARGB8888);
108-
109- if (!im)
110- {
111- if (obr->xob) _unfind_xob(obr->xob, 0);
112- im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
113- if (!im)
114- {
115- free(obr);
116- return NULL;
117- }
118- else
119- {
120- im->cache_entry.w = w;
121- im->cache_entry.h = h;
122- im->cache_entry.flags.alpha |= alpha ? 1 : 0;
123- evas_cache_image_surface_alloc(&im->cache_entry, w, h);
124- }
125- }
126+ free(obr);
127+ return NULL;
128 }
129-
130- /* Need to update cache_entry w/h here because the render path expects them to be updated
131- * to the new geometry. */
132 im->cache_entry.w = w;
133 im->cache_entry.h = h;
134 im->cache_entry.flags.alpha |= alpha ? 1 : 0;
135-
136+#ifdef EVAS_CSERVE2
137+ if (evas_cserve2_use_get())
138+ evas_cache2_image_surface_alloc(&im->cache_entry, w, h);
139+ else
140+#endif
141+ evas_cache_image_surface_alloc(&im->cache_entry, w, h);
142 im->extended_info = obr;
143 if ((buf->rot == 0) || (buf->rot == 180))
144 {
145--
146cgit v0.9.1
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.7.bb b/meta-efl/recipes-efl/efl/evas_1.7.7.bb
deleted file mode 100644
index 20355ec6a..000000000
--- a/meta-efl/recipes-efl/efl/evas_1.7.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.2"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7 file://revert.r83789.patch \
8"
9
10SRC_URI[md5sum] = "980abd6f645a38aa0a5d74f11a0e07f9"
11SRC_URI[sha256sum] = "ea8403d58cd079a651c515e76d7812deb0f7c2f41bb9807b3040a023b2fba78c"
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.8.bb b/meta-efl/recipes-efl/efl/evas_1.7.8.bb
new file mode 100644
index 000000000..f9bf8d038
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "ca6a5a28f0fc5b0eac36210d4df139fb"
8SRC_URI[sha256sum] = "048f16454c2601851e9b17591579f60e25727c09beadaf3567fa443dfbaed0da"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.7.bb b/meta-efl/recipes-efl/efl/expedite_1.7.7.bb
deleted file mode 100644
index be922b519..000000000
--- a/meta-efl/recipes-efl/efl/expedite_1.7.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "46c6c6b21910b97caa62da57a0cd4b83"
10SRC_URI[sha256sum] = "62f1caba9715ce9d4047fa9a2c4ed6c756cc37fc0078404b7074d16b9293c333"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.8.bb b/meta-efl/recipes-efl/efl/expedite_1.7.8.bb
new file mode 100644
index 000000000..8be92c20c
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/expedite_1.7.8.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
5"
6
7SRC_URI[md5sum] = "378d4abb513fd4ae1d2e2f75a2d970e4"
8SRC_URI[sha256sum] = "ac80d3f13af4f644e048a1fcb71fd5f12fdef7c11c19fe61c868273bf3f4deb9"