From 48bec78f694122038a76412c94e34d92e6a68546 Mon Sep 17 00:00:00 2001 From: Ewan LE BIDEAU-CANEVET Date: Wed, 25 Sep 2013 18:44:05 +0200 Subject: [PATCH] remove useless files wayland/weston --- .../recipes-graphics/wayland/wayland_1.2.0.bb | 25 ------- .../recipes-graphics/wayland/weston/groups.patch | 47 ------------ .../wayland/weston/install-examples.patch | 18 ----- .../wayland/weston/weston-launch-shell.patch | 74 ------------------- .../recipes-graphics/wayland/weston/weston.desktop | 9 --- .../recipes-graphics/wayland/weston/weston.png | Bin 2383 -> 0 bytes .../recipes-graphics/wayland/weston_1.2.0.bb | 79 --------------------- 7 files changed, 252 deletions(-) delete mode 100644 meta-wrt-tizen/recipes-graphics/wayland/wayland_1.2.0.bb delete mode 100644 meta-wrt-tizen/recipes-graphics/wayland/weston/groups.patch delete mode 100644 meta-wrt-tizen/recipes-graphics/wayland/weston/install-examples.patch delete mode 100644 meta-wrt-tizen/recipes-graphics/wayland/weston/weston-launch-shell.patch delete mode 100644 meta-wrt-tizen/recipes-graphics/wayland/weston/weston.desktop delete mode 100644 meta-wrt-tizen/recipes-graphics/wayland/weston/weston.png delete mode 100644 meta-wrt-tizen/recipes-graphics/wayland/weston_1.2.0.bb diff --git a/meta-wrt-tizen/recipes-graphics/wayland/wayland_1.2.0.bb b/meta-wrt-tizen/recipes-graphics/wayland/wayland_1.2.0.bb deleted file mode 100644 index f001b43..0000000 --- a/meta-wrt-tizen/recipes-graphics/wayland/wayland_1.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ - file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "48d375afb15f3e68a72cf7b4fd8f4a63" -SRC_URI[sha256sum] = "6b0439a017185bc5b2fed96c178bed3abf7f19188f3078f4d69fd3ce222d654c" -inherit autotools pkgconfig - -# We need wayland-native for the wayland-scanner utility -BBCLASSEXTEND = "native" - -DEPENDS_virtclass-native = "expat-native libffi-native" -DEPENDS = "expat libffi wayland-native" - -EXTRA_OECONF_virtclass-native = "--disable-documentation" -EXTRA_OECONF = "--disable-documentation --disable-scanner" diff --git a/meta-wrt-tizen/recipes-graphics/wayland/weston/groups.patch b/meta-wrt-tizen/recipes-graphics/wayland/weston/groups.patch deleted file mode 100644 index 9dc043a..0000000 --- a/meta-wrt-tizen/recipes-graphics/wayland/weston/groups.patch +++ /dev/null @@ -1,47 +0,0 @@ -Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65933) -Signed-off-by: Ross Burton - -From 42821739a228a85ce3432be1796858e5cc31688b Mon Sep 17 00:00:00 2001 -From: Quentin Glidic -Date: Wed, 19 Jun 2013 15:27:11 +0200 -Subject: [PATCH weston] weston-launch: Set all groups for user - -Signed-off-by: Quentin Glidic ---- - configure.ac | 2 +- - src/weston-launch.c | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b625221..db3feb0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,7 +52,7 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include ]]) - AC_CHECK_HEADERS([execinfo.h]) - --AC_CHECK_FUNCS([mkostemp strchrnul]) -+AC_CHECK_FUNCS([mkostemp strchrnul initgroups]) - - COMPOSITOR_MODULES="wayland-server >= 1.1.90 xkbcommon pixman-1" - -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 76dcede..7d7b556 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -631,9 +631,13 @@ main(int argc, char *argv[]) - } - - if (setgid(wl.pw->pw_gid) < 0 || -+#ifdef HAVE_INITGROUPS -+ initgroups(wl.pw->pw_name, wl.pw->pw_gid) < 0 || -+#endif - setuid(wl.pw->pw_uid) < 0) - error(1, errno, "dropping privilidges failed"); - -+ - if (sleep_fork) { - if (wl.verbose) - printf("weston-launch: waiting %d seconds\n", sleep_fork); --- -1.8.3 diff --git a/meta-wrt-tizen/recipes-graphics/wayland/weston/install-examples.patch b/meta-wrt-tizen/recipes-graphics/wayland/weston/install-examples.patch deleted file mode 100644 index 3e2852c..0000000 --- a/meta-wrt-tizen/recipes-graphics/wayland/weston/install-examples.patch +++ /dev/null @@ -1,18 +0,0 @@ -Install the examples so we can package them. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - -diff --git a/clients/Makefile.am b/clients/Makefile.am -index 621c7c3..749ef20 100644 ---- a/clients/Makefile.am -+++ b/clients/Makefile.am -@@ -2,7 +2,7 @@ bin_PROGRAMS = \ - weston-info \ - $(terminal) - --noinst_PROGRAMS = \ -+bin_PROGRAMS += \ - $(clients_programs) \ - $(poppler_programs) \ - $(simple_clients_programs) \ diff --git a/meta-wrt-tizen/recipes-graphics/wayland/weston/weston-launch-shell.patch b/meta-wrt-tizen/recipes-graphics/wayland/weston/weston-launch-shell.patch deleted file mode 100644 index ffe0608..0000000 --- a/meta-wrt-tizen/recipes-graphics/wayland/weston/weston-launch-shell.patch +++ /dev/null @@ -1,74 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From ff3230952a68077669e0ea0ac3ceb234273556fc Mon Sep 17 00:00:00 2001 -From: Quentin Glidic -Date: Fri, 17 May 2013 16:20:37 +0200 -Subject: [PATCH] weston-launch: Run weston in the user login shell - -This patch brings back the user environment from the shell. -In the future, weston-launch could create the Wayland socket earlier, in -which case the user's shell could be used to run Wayland-specific tools -in the new Weston session. - -Signed-off-by: Quentin Glidic ---- - src/weston-launch.c | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 64d4a8a..89c3c5a 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -60,6 +60,8 @@ - - #include "weston-launch.h" - -+#define MAX_ARGV_SIZE 256 -+ - struct weston_launch { - struct pam_conv pc; - pam_handle_t *ph; -@@ -523,8 +525,9 @@ main(int argc, char *argv[]) - struct weston_launch wl; - char **env; - int i, c; -- char **child_argv; -+ char *child_argv[MAX_ARGV_SIZE]; - char *tty = NULL, *new_user = NULL; -+ char *term; - int sleep_fork = 0; - struct option opts[] = { - { "user", required_argument, NULL, 'u' }, -@@ -562,8 +565,8 @@ main(int argc, char *argv[]) - } - } - -- child_argv = &argv[optind-1]; -- child_argv[0] = BINDIR "/weston"; -+ if ((argc - optind) > (MAX_ARGV_SIZE - 5)) -+ error(1, E2BIG, "Too many arguments to pass to weston"); - - if (new_user) - wl.pw = getpwnam(new_user); -@@ -572,7 +575,17 @@ main(int argc, char *argv[]) - if (wl.pw == NULL) - error(1, errno, "failed to get username"); - -+ child_argv[0] = wl.pw->pw_shell; -+ child_argv[1] = "-l"; -+ child_argv[2] = "-c"; -+ child_argv[3] = BINDIR "/weston \"$@\""; -+ child_argv[4] = "weston"; -+ for (i = 0; i < (argc - optind); ++i) -+ child_argv[5+i] = argv[optind+i]; -+ -+ term = getenv("TERM"); - clearenv(); -+ setenv("TERM", term, 1); - setenv("USER", wl.pw->pw_name, 1); - setenv("LOGNAME", wl.pw->pw_name, 1); - setenv("HOME", wl.pw->pw_dir, 1); --- -1.7.10.4 - diff --git a/meta-wrt-tizen/recipes-graphics/wayland/weston/weston.desktop b/meta-wrt-tizen/recipes-graphics/wayland/weston/weston.desktop deleted file mode 100644 index 1086ae8..0000000 --- a/meta-wrt-tizen/recipes-graphics/wayland/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/meta-wrt-tizen/recipes-graphics/wayland/weston/weston.png b/meta-wrt-tizen/recipes-graphics/wayland/weston/weston.png deleted file mode 100644 index ea8b7e0e233c86301a88e5bc925f09b3de2f9dec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2383 zcmV-V39$BwP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L00vqB00vqCV0pn~000Od zNklxQqBu<>r2)6lHU)*YGzD6ustAQm;suEZ zhy*;Kma`z8lfl}Zs zt(P8+CIeqHN%sZD!;$E}D=->`wJ4A{*-ZKJL!lV-N%25gfT6XP%v!n#FS3o9;k$el zEw@6~y|s39h@#XAXucVg0ZW%aSL#DjK(fo5S{d|YSh)e1F0G!WRlt)hzVZG*NdkI5 z15N8gicM(04cdm>n3{&%QE--6R?H@77?5XY$sl)Z6)5!lt3D_jSY$*2q=0V$cTzkZ zbwTT`kn9Y_lnM4C*!e(lq7zo`f|f1r49k!^0hMem6S^$f=)Y@ltl+)tUPyMy^Xv%B zzBojZFQY3;9}=c~E`YBhg%g%8L=7qvdLD*Eb8QCtFK&aj!6{1pY8wJ09mH6&4LU#O z_OoDSKRA{Gz61;c7@=ijJ8*}u-Bp=3hxMW$`r+! zjnKSFK9{dT?sc#8YTywsra*%IA;JM~=b|oWlBP{-2sUX7u0202?EA<0ylV|`hAvyK#*9d29WHCbRpF%B?F|=_k9k`2FX+- zCF~dt0@7@Tj-b*|7=y|}*un{?r4zhnEMz(sO*4BP=#OKx0xL%eajTmqLu-m;X*{V{|`$$li(87AM z6WVTzx~?!5cgS09$n@!suwgVxWsa*sO&fyQc6}TY?eaXc4=(&vo;&V_)@?!Q&_LUV z#EqWhPe5fpj;T%$RN%ViO|pj7TTh$TLHb5W_dwTu(q=Eh#51sPRBBJM6Z$?2h8c`& z{h$QAC&kmXiR1==;m#u{x0MAbjJq?mYlkFzgo*A?2K6TU56F%}aa^`60NoD=s~RxV z(0of&Pu;y2mbdE+{8Ty@d@f(99ij|a`>6Zu2Ke-TsN|t|O2G9zEE(9n6Bgfs^bL?1 z40KeokbkQlsGP^t`Pk2;v+=8bs!x6%vkR}eZd`(^e{`1=1uMS@P49!2ZQ^p@?7ty* zyxvX5gjc6dBAfX{n=3QPG?l-=AhaZRdEmXr-oO9eMlQMOZEP+W-9_@-A9 zP5@V6djYZ)|`OK z9lZv%3aLU)+{c%JF+=U}8}dOBK{D{W zNWcX$b5JrYEOxPeW@^NEcx`ivaBdIePgVzb3HT9mC`RoFfeNwp3h)?Sl~+jMp80-s zLuO5j>*7QqZV!K-ABE|C)qrf^7f9In7$Qtnx$!$bFf>d)2jjbgLYX@v?A5#MwdSGV zUQgILnE085LLe33IpBLhA!NJ8eIBq1@HDU+_ehPl1laKh;p`IM;*?=-ME);6 zEA9*?kOzJOd=r=p1M-ND759{*kWevaII={P{KphDM+LD?Pgu2mQSKH>guL3XT(c-1&a zK^y}P0DFNqfJ!|u%Yjlr7cd9d{uSdP-&}^)&6_Bm*?_&c205a&x)WIht^lWzg?`-C zqn88oZkY0~$Z9TQrB4E|smyC$?(h~gMd+&X-GW#aR1B~%z*x0&tFCOWlNI>MZcDkiHCXvpcpM70000bbVXQnWMOn=I&E)cX=Zr