From 8c4aa60b372e24ebc5c61771ad2f622a9c6d5ef5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Oct 2009 08:07:14 +0200 Subject: [PATCH] move package enna: - no more need, move to pkg-archive branch --- packages/mediacenter/enna/build | 60 ---------- packages/mediacenter/enna/conf.d/enna | 11 -- packages/mediacenter/enna/config/enna.cfg | 107 ------------------ packages/mediacenter/enna/install | 50 -------- .../mediacenter/enna/patches/10_theme.diff | 54 --------- packages/mediacenter/enna/patches/README | 1 - packages/mediacenter/enna/url | 1 - packages/mediacenter/enna/xinitrc.d/99_enna | 25 ---- 8 files changed, 309 deletions(-) delete mode 100755 packages/mediacenter/enna/build delete mode 100644 packages/mediacenter/enna/conf.d/enna delete mode 100644 packages/mediacenter/enna/config/enna.cfg delete mode 100755 packages/mediacenter/enna/install delete mode 100644 packages/mediacenter/enna/patches/10_theme.diff delete mode 100644 packages/mediacenter/enna/patches/README delete mode 100644 packages/mediacenter/enna/url delete mode 100755 packages/mediacenter/enna/xinitrc.d/99_enna diff --git a/packages/mediacenter/enna/build b/packages/mediacenter/enna/build deleted file mode 100755 index 75f575d7e8..0000000000 --- a/packages/mediacenter/enna/build +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build freetype -$SCRIPTS/build eina -$SCRIPTS/build eet -$SCRIPTS/build evas -$SCRIPTS/build ecore -$SCRIPTS/build efreet -$SCRIPTS/build embryo -$SCRIPTS/build edje -$SCRIPTS/build e_dbus -$SCRIPTS/build elementary -$SCRIPTS/build libsvdrp -$SCRIPTS/build curl -$SCRIPTS/build libxml2 -$SCRIPTS/build libplayer -$SCRIPTS/build libvalhalla -$SCRIPTS/build libexif -$SCRIPTS/build libXrandr -$SCRIPTS/build libcddb -$SCRIPTS/build lirc -$SCRIPTS/build gettext - -cd $PKG_BUILD -LIBS="-lintl" \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --disable-static \ - --enable-shared \ - --disable-theme \ - --enable-activity-games \ - --enable-activity-music \ - --enable-activity-photo \ - --enable-activity-tv \ - --enable-activity-video \ - --enable-activity-weather \ - --enable-browser-cdda \ - --enable-browser-dvd \ - --enable-browser-localfiles \ - --enable-browser-netstreams \ - --enable-browser-shoutcast \ - --enable-browser-upnp \ - --enable-browser-valhalla \ - --enable-efreet \ - --enable-libsvdrp \ - --enable-volume-hal \ - --disable-volume-mtab \ - --enable-libcddb \ - --enable-libcurl \ - --enable-libxml2 \ - --enable-libxrandr \ - -make diff --git a/packages/mediacenter/enna/conf.d/enna b/packages/mediacenter/enna/conf.d/enna deleted file mode 100644 index 4107c5e952..0000000000 --- a/packages/mediacenter/enna/conf.d/enna +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# enna environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -#------------------------------------------------------------------------------- -# Configfile to use -#------------------------------------------------------------------------------- -ENNA_CONFIG="/usr/etc/enna.cfg" diff --git a/packages/mediacenter/enna/config/enna.cfg b/packages/mediacenter/enna/config/enna.cfg deleted file mode 100644 index c9321d78fb..0000000000 --- a/packages/mediacenter/enna/config/enna.cfg +++ /dev/null @@ -1,107 +0,0 @@ -[enna] -#none,event,info,warning,error,critical -verbosity=info -log_file=/var/log/enna.log - -#0,1 -fullscreen=1 - -idle_timeout=0 - -#/home/user/theme.edj for specific file or just 'default' if theme is -#located at /usr/share/enna/theme/default.edj -theme=default - -#software_x11,xrender_x11,opengl_x11,software_x11_16 -engine=opengl_x11 - -music_ext=3gp,aac,ape,apl,flac,m4a,mac,mka,mp2,mp3,mp4,mpc,ogg,ra,wav,wma -video_ext=asf,avi,divx,dvr-ms,evo,flc,fli,flv,m1v,m2v,m4p,m4v,mkv,mov,mp4,mp4v,mpe,mpeg,mpg,ogm,qt,rm,rmvb,swf,ts,vdr,vob,vro,wmv,y4m -photo_ext=jpg,jpeg,png,gif,tif,tiff,xpm - -[mediaplayer] -# Values by default are 'mplayer' type, 'auto' video_out, 'auto' audio_out -# and 'warning' verbosity. Change these parameters only if that is really -# necessary. - -#mplayer,xine -type=mplayer -#dvd_type= -#tv_type= - -#auto,vdpau,x11,xv,gl,fb -video_out=auto - -#auto,alsa,oss -audio_out=alsa - -#verbose,info,warning,error,critical,none -verbosity=info - -#auto,top,middle,bottom -sub_align=auto - -#auto (value set to 100 for bottom),M..N where M and N are integer -sub_pos=auto - -#auto (value set to 5) ,M..N where M and N are integer -sub_scale=auto - -#auto,yes,no -sub_visibility=auto - -#no,soft,hard -framedrop=no - -[localfiles] -path_music=file:///storage/Musik,Music,icon/favorite -#path_music=file:///path/to/server/Medias/Music,Server,icon/dev/nfs -path_video=file:///storage/Videos,Videos,icon/favorite -#path_video=file:///path/to/server/Medias/Videos,Server,icon/dev/nfs -path_photo=file:///storage/Bilder,Photos,icon/favorite -#path_photo=file:///path/to/server/Medias/Photos,Server,icon/dev/nfs - -[netstreams] -stream_video=http://mafreebox.freebox.fr/freeboxtv/playlist.m3u,FreeboxTV,icon/freeboxtv - -[tv] -# Default: 'vdr:/' (autodetect local VDR) -# Local VDR: 'vdr://tmp/vdr-xine/stream#demux:mpeg_pes -# Remote VDR: 'netvdr://192.168.1.1:18701 -#vdr_uri= - -# Default: 2001 -#svdrp_port= - -# Default: 30 -#svdrp_timeout= - -#verbose,info,warning,error,critical,none -#svdrp_verbosity=info - -# Don't exit if a timer will fire before this value (in minutes) -# Default: 15 -#timer_quit_threshold= - -[weather] -city=New York - -[media_db] -path=file:///storage/Musik -# path=file:///path/to/server/Medias/Music -verbosity=info -parser_number=2 -commit_interval=128 -# <=0 for infinite -scan_loop=-1 -# time [sec] for sleeping between loops -scan_sleep=900 -# 0: normal, -20: higher, 19 lower -scan_priority=19 - -# blacklisted keywords -blacklist_keywords=0tv,1080p,2hd,720p,ac3,booya,caph,crimson,ctu,dimension,divx,dot,dsr,dvdrip,dvdscr,e7,etach,fov,fqm,hdq,hdtv,lol,mainevent,notv,pdtv,proper,pushercrew,repack,reseed,screencam,screener,sys,vtv,x264,xor,xvid - -[podcast] -#stream=stream url -stream=http://example.com/podcast.xml diff --git a/packages/mediacenter/enna/install b/packages/mediacenter/enna/install deleted file mode 100755 index 8a4920b1ed..0000000000 --- a/packages/mediacenter/enna/install +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/install gettext -$SCRIPTS/install freetype -$SCRIPTS/install eina -$SCRIPTS/install eet -$SCRIPTS/install evas -$SCRIPTS/install ecore -$SCRIPTS/install embryo -$SCRIPTS/install edje -$SCRIPTS/install e_dbus -$SCRIPTS/install elementary -$SCRIPTS/install libxml2 -$SCRIPTS/install libplayer -$SCRIPTS/install libvalhalla -$SCRIPTS/install libsvdrp -$SCRIPTS/install libexif -$SCRIPTS/install libXrandr -$SCRIPTS/install libcddb -$SCRIPTS/install enna-theme -$SCRIPTS/install liberation-fonts -$SCRIPTS/install lirc -$SCRIPTS/install vdr -$SCRIPTS/install efreet - -PKG_DIR=`find $PACKAGES -type d -name $1` - -mkdir -p $INSTALL/usr/bin - cp $BUILD/$1*/src/bin/enna $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/lib/enna/modules - cp $PKG_BUILD/src/modules/*/*/.libs/*.so $INSTALL/usr/lib/enna/modules - -for loc in $INCLUDED_LOCALES; do - LOCALE=`echo $loc|cut -f1 -d.` - [ ! -r $BUILD/$1*/po/$LOCALE.gmo ] && \ - LOCALE=`echo $loc|cut -f1 -d_` - - if [ -r $BUILD/$1*/po/$LOCALE.gmo ]; then - mkdir -p $INSTALL/usr/share/locale/$LOCALE/LC_MESSAGES - cp $BUILD/$1*/po/$LOCALE.gmo \ - $INSTALL/usr/share/locale/$LOCALE/LC_MESSAGES/$1.mo - fi -done - -mkdir -p $INSTALL/usr/etc - cp $PKG_DIR/config/enna.cfg $INSTALL/usr/etc - diff --git a/packages/mediacenter/enna/patches/10_theme.diff b/packages/mediacenter/enna/patches/10_theme.diff deleted file mode 100644 index 0543b581e1..0000000000 --- a/packages/mediacenter/enna/patches/10_theme.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff -Naur enna-r1629.orig/data/theme/default/icons.edc enna-r1629/data/theme/default/icons.edc ---- enna-r1629.orig/data/theme/default/icons.edc 2009-07-03 21:16:00.000000000 +0200 -+++ enna-r1629/data/theme/default/icons.edc 2009-07-03 21:16:22.000000000 +0200 -@@ -116,7 +116,7 @@ - STOCK_ICON("weather_sun_storm.png", "weather/sun_storm"); - STOCK_ICON("weather_windy.png", "weather/windy"); - --//STOCK_ICON("default_backdrop.png", "backdrop/default"); -+STOCK_ICON("default_backdrop.png", "backdrop/default"); - - STOCK_ICON("rating0.png", "rating/0"); - STOCK_ICON("rating1.png", "rating/1"); -diff -Naur enna-r1629.orig/data/theme/default/video.edc enna-r1629/data/theme/default/video.edc ---- enna-r1629.orig/data/theme/default/video.edc 2009-07-03 21:16:00.000000000 +0200 -+++ enna-r1629/data/theme/default/video.edc 2009-07-03 21:16:25.000000000 +0200 -@@ -114,7 +114,7 @@ - description { - state: "default" 0.0; - rel1.relative: 0 0; -- rel2.relative: 1.0 1.0; -+ rel2.relative: 1.0 0.75; - } - } - -@@ -126,20 +126,24 @@ - description { - state: "default" 0.0; - visible: 0; -- color: 0 0 0 0; - rel1.relative: 0.0 0.75; - rel2.relative: 1.0 1.0; - image - { -- normal: "panel_bottom.png"; -- border: 0 0 24 0; -+ normal: "filebrowser_tile.png"; -+ border: 0 0 0 0; - } - } - description { - state: "show" 0.0; -- inherit: "default" 0.0; - visible: 1; -- color: 255 255 255 255; -+ rel1.relative: 0.0 0.75; -+ rel2.relative: 1.0 1.0; -+ image -+ { -+ normal: "filebrowser_tile.png"; -+ border: 0 0 0 0; -+ } - } - } - diff --git a/packages/mediacenter/enna/patches/README b/packages/mediacenter/enna/patches/README deleted file mode 100644 index 1ab0264085..0000000000 --- a/packages/mediacenter/enna/patches/README +++ /dev/null @@ -1 +0,0 @@ -The 10_theme.diff patch is meant to be used on host when generating a new enna theme. diff --git a/packages/mediacenter/enna/url b/packages/mediacenter/enna/url deleted file mode 100644 index c7dcea5e36..0000000000 --- a/packages/mediacenter/enna/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/enna-20091012.tar.bz2 diff --git a/packages/mediacenter/enna/xinitrc.d/99_enna b/packages/mediacenter/enna/xinitrc.d/99_enna deleted file mode 100755 index 16f0395892..0000000000 --- a/packages/mediacenter/enna/xinitrc.d/99_enna +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -################################################################################ -# Start Enna Mediacenter program. -# -# The Enna Mediacenter program (not the window manager) is the application that -# runs in the foreground because it is the only application that we can be sure -# will be running. -################################################################################ - -. /etc/sysconfig - -export ELM_ENGINE=gl - -args="-f -c $ENNA_CONFIG" - - while true; do - DISPLAY=:0.0 /usr/bin/enna ${args} > /dev/null 2>&1 -# if [ "$?" = 0 ]; then -# if [ -x /usr/bin/vdrshutdown ]; then -# /usr/bin/vdrshutdown -# killall -q -TERM runvdr -# fi -# break -# fi - done