From a6fc9043fd2f0b043558ba63494411f74549f9ab Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Oct 2009 11:14:55 +0100 Subject: [PATCH] move package wayland: - no more need, move to pkg-archive branch --- packages/other/wayland/build | 23 -------------- packages/other/wayland/conf.d/wayland | 11 ------- packages/other/wayland/init.d/65_wayland | 29 ------------------ packages/other/wayland/install | 30 ------------------- .../wayland/patches/wayland-crosscompile.diff | 29 ------------------ packages/other/wayland/url | 1 - 6 files changed, 123 deletions(-) delete mode 100755 packages/other/wayland/build delete mode 100644 packages/other/wayland/conf.d/wayland delete mode 100755 packages/other/wayland/init.d/65_wayland delete mode 100755 packages/other/wayland/install delete mode 100644 packages/other/wayland/patches/wayland-crosscompile.diff delete mode 100644 packages/other/wayland/url diff --git a/packages/other/wayland/build b/packages/other/wayland/build deleted file mode 100755 index 93c853ecf6..0000000000 --- a/packages/other/wayland/build +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build udev -$SCRIPTS/build eagle -$SCRIPTS/build libffi -$SCRIPTS/build libpng -$SCRIPTS/build $CAIRO -$SCRIPTS/build gtk+ - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - -make - -$MAKEINSTALL diff --git a/packages/other/wayland/conf.d/wayland b/packages/other/wayland/conf.d/wayland deleted file mode 100644 index bdea77bf79..0000000000 --- a/packages/other/wayland/conf.d/wayland +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# Wayland environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -#------------------------------------------------------------------------------- -# Wayland background image -#------------------------------------------------------------------------------- -OE_WAYLAND_BACKGROUND=/usr/share/wayland/background.png diff --git a/packages/other/wayland/init.d/65_wayland b/packages/other/wayland/init.d/65_wayland deleted file mode 100755 index cd82f86f88..0000000000 --- a/packages/other/wayland/init.d/65_wayland +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# starting Wayland Displayserver -# -# runlevels: openelec, debug - -. /etc/sysconfig - -if test -f /usr/bin/wayland-system-compositor; then - - progress "starting Wayland" - - if test -f $OE_WAYLAND_BACKGROUND; then - wayland-system-compositor \ - -b $OE_WAYLAND_BACKGROUND > /dev/null 2>&1 & - else - wayland-system-compositor > /dev/null 2>&1 & - fi - sleep 3 && flower & - sleep 3 && flower & - sleep 3 && flower & - sleep 3 && flower & - sleep 3 && flower & - sleep 3 && flower & - - echo "*** debug shell - type exit to exit ***" - exec /bin/sh /dev/tty1 2>&1 - -fi \ No newline at end of file diff --git a/packages/other/wayland/install b/packages/other/wayland/install deleted file mode 100755 index ad573f8a26..0000000000 --- a/packages/other/wayland/install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/install udev -$SCRIPTS/install eagle -$SCRIPTS/install libffi -$SCRIPTS/install libpng -$SCRIPTS/install $CAIRO -$SCRIPTS/install gtk+ - -mkdir -p $INSTALL/usr/lib -cp -PR $PKG_BUILD/libwayland*.so* $INSTALL/usr/lib - -mkdir -p $INSTALL/usr/bin -cp -PR $PKG_BUILD/flower $INSTALL/usr/bin -cp -PR $PKG_BUILD/gears $INSTALL/usr/bin -cp -PR $PKG_BUILD/image $INSTALL/usr/bin -cp -PR $PKG_BUILD/screenshot $INSTALL/usr/bin -cp -PR $PKG_BUILD/terminal $INSTALL/usr/bin -cp -PR $PKG_BUILD/wayland-system-compositor $INSTALL/usr/bin - -if [ -f $PROJECT_DIR/$PROJECT/background/background.png ]; then - mkdir -p $INSTALL/usr/share/wayland/ - cp -PR $PROJECT_DIR/$PROJECT/background/background.png \ - $INSTALL/usr/share/wayland/ -fi - -mkdir -p $INSTALL/lib/udev/rules.d -cp -PR $PKG_BUILD/70-wayland.rules $INSTALL/lib/udev/rules.d diff --git a/packages/other/wayland/patches/wayland-crosscompile.diff b/packages/other/wayland/patches/wayland-crosscompile.diff deleted file mode 100644 index 1748dc1586..0000000000 --- a/packages/other/wayland/patches/wayland-crosscompile.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur wayland-20090913/Makefile.in wayland-20090913.patch/Makefile.in ---- wayland-20090913/Makefile.in 2009-05-29 02:23:31.000000000 +0200 -+++ wayland-20090913.patch/Makefile.in 2009-09-18 16:14:57.000000000 +0200 -@@ -27,7 +27,7 @@ - $(libs) : CFLAGS += -fPIC @FFI_CFLAGS@ - $(libs) : LDLIBS += @FFI_LIBS@ - $(libs) : -- gcc -shared $^ $(LDLIBS) -o $@ -+ $(CC) -shared $^ $(LDLIBS) -o $@ - - wayland-system-compositor : \ - wayland-system-compositor.o \ -@@ -54,11 +54,11 @@ - $(cairo_clients) : LDLIBS += -L. -lwayland @CAIRO_CLIENT_LIBS@ -lrt - - install : $(libs) $(compositors) -- install -d @libdir@ @libdir@/pkgconfig ${udev_rules_dir} -- install $(libs) @libdir@ -- install wayland-server.pc wayland.pc @libdir@/pkgconfig -- install wayland-client.h @includedir@ -- install 70-wayland.rules ${udev_rules_dir} -+ install -d ${DESTDIR}@libdir@ ${DESTDIR}@libdir@/pkgconfig ${DESTDIR}${udev_rules_dir} -+ install $(libs) ${DESTDIR}/@libdir@ -+ install wayland-server.pc wayland.pc ${DESTDIR}@libdir@/pkgconfig -+ install wayland-client.h ${DESTDIR}@includedir@ -+ install 70-wayland.rules ${DESTDIR}${udev_rules_dir} - - clean : - rm -f $(clients) $(compositors) *.o *.so diff --git a/packages/other/wayland/url b/packages/other/wayland/url deleted file mode 100644 index 255bd7bba1..0000000000 --- a/packages/other/wayland/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/wayland-20090913.tar.bz2 \ No newline at end of file