From: kos Date: Tue, 11 Dec 2012 05:33:09 +0000 (+0900) Subject: Merge branch 'master' of http://192.168.102.71/openvuplus X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=462d73d2987416bb23b756e4379a1c830e925604;hp=42f0cc9ac2256e062368452f98b9db4b62ae8359 Merge branch 'master' of 192.168.102.71/openvuplus Conflicts: meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc --- diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig index 52bd62b..76331f1 100644 --- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig +++ b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig @@ -521,8 +521,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # CONFIG_REV is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set -CONFIG_BLKID=y -CONFIG_FEATURE_BLKID_TYPE=y +# CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y diff --git a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend index 9537987..ac5052b 100644 --- a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend +++ b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend @@ -1,4 +1,4 @@ -PR .= "-vuplus2" +PR .= "-vuplus3" SRC_URI += "file://busybox-telnetd.xinetd.in \ file://busybox-telnetd@.service \ diff --git a/meta-openvuplus/recipes-extended/irqbalance/irqbalance_0.56.bb b/meta-openvuplus/recipes-extended/irqbalance/irqbalance_0.56.bb new file mode 100644 index 0000000..aec35b2 --- /dev/null +++ b/meta-openvuplus/recipes-extended/irqbalance/irqbalance_0.56.bb @@ -0,0 +1,12 @@ +SUMMARY = "Daemon to balance interrupts for SMP systems" +HOMEPAGE = "http://irqbalance.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "glib-2.0" +PR = "r1" + +SRC_URI = "http://irqbalance.org/releases/${BP}.tar.bz2" +SRC_URI[md5sum] = "cd0c4d3b2bb84778a04fc594ad83949a" +SRC_URI[sha256sum] = "516e1bdc5469f0f350e2e9ad2925b221faa4497a608c8d4e28a997938451c5fc" + +inherit autotools diff --git a/meta-openvuplus/recipes-extended/tzdata/tzdata_2012b.bbappend b/meta-openvuplus/recipes-extended/tzdata/tzdata_2012b.bbappend new file mode 100644 index 0000000..379c927 --- /dev/null +++ b/meta-openvuplus/recipes-extended/tzdata/tzdata_2012b.bbappend @@ -0,0 +1,83 @@ +PRINC = "2" + +DEFAULT_TIMEZONE = "CET" + +FILES_${PN} = " \ + ${datadir}/zoneinfo/Africa/Casablanca \ + ${datadir}/zoneinfo/Africa/Harare \ + ${datadir}/zoneinfo/Africa/Kinshasa \ + ${datadir}/zoneinfo/Africa/Nairobi \ + ${datadir}/zoneinfo/America/Anchorage \ + ${datadir}/zoneinfo/America/Bogota \ + ${datadir}/zoneinfo/America/Caracas \ + ${datadir}/zoneinfo/America/Danmarkshavn \ + ${datadir}/zoneinfo/America/Halifax \ + ${datadir}/zoneinfo/America/Manaus \ + ${datadir}/zoneinfo/America/Noronha \ + ${datadir}/zoneinfo/America/Regina \ + ${datadir}/zoneinfo/America/Santiago \ + ${datadir}/zoneinfo/America/Sao_Paulo \ + ${datadir}/zoneinfo/America/St_Johns \ + ${datadir}/zoneinfo/America/Tijuana \ + ${datadir}/zoneinfo/Asia/Almaty \ + ${datadir}/zoneinfo/Asia/Baghdad \ + ${datadir}/zoneinfo/Asia/Baku \ + ${datadir}/zoneinfo/Asia/Bangkok \ + ${datadir}/zoneinfo/Asia/Calcutta \ + ${datadir}/zoneinfo/Asia/Colombo \ + ${datadir}/zoneinfo/Asia/Dhaka \ + ${datadir}/zoneinfo/Asia/Hong_Kong \ + ${datadir}/zoneinfo/Asia/Irkutsk \ + ${datadir}/zoneinfo/Asia/Jerusalem \ + ${datadir}/zoneinfo/Asia/Kabul \ + ${datadir}/zoneinfo/Asia/Kathmandu \ + ${datadir}/zoneinfo/Asia/Kolkata \ + ${datadir}/zoneinfo/Asia/Krasnoyarsk \ + ${datadir}/zoneinfo/Asia/Kuala_Lumpur \ + ${datadir}/zoneinfo/Asia/Magadan \ + ${datadir}/zoneinfo/Asia/Muscat \ + ${datadir}/zoneinfo/Asia/Omsk \ + ${datadir}/zoneinfo/Asia/Rangoon \ + ${datadir}/zoneinfo/Asia/Riyadh \ + ${datadir}/zoneinfo/Asia/Seoul \ + ${datadir}/zoneinfo/Asia/Taipei \ + ${datadir}/zoneinfo/Asia/Tashkent \ + ${datadir}/zoneinfo/Asia/Tehran \ + ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Asia/Vladivostok \ + ${datadir}/zoneinfo/Asia/Yakutsk \ + ${datadir}/zoneinfo/Atlantic/Azores \ + ${datadir}/zoneinfo/Atlantic/Cape_Verde \ + ${datadir}/zoneinfo/Australia/Adelaide \ + ${datadir}/zoneinfo/Australia/Brisbane \ + ${datadir}/zoneinfo/Australia/Darwin \ + ${datadir}/zoneinfo/Australia/Hobart \ + ${datadir}/zoneinfo/Australia/Perth \ + ${datadir}/zoneinfo/Australia/Sydney \ + ${datadir}/zoneinfo/Brazil/East \ + ${datadir}/zoneinfo/Brazil/West \ + ${datadir}/zoneinfo/Canada/Newfoundland \ + ${datadir}/zoneinfo/Canada/Saskatchewan \ + ${datadir}/zoneinfo/CET \ + ${datadir}/zoneinfo/CST6CDT \ + ${datadir}/zoneinfo/EST \ + ${datadir}/zoneinfo/EST5EDT \ + ${datadir}/zoneinfo/Europe/Dublin \ + ${datadir}/zoneinfo/Europe/Istanbul \ + ${datadir}/zoneinfo/Europe/Moscow \ + ${datadir}/zoneinfo/MST \ + ${datadir}/zoneinfo/MST7MDT \ + ${datadir}/zoneinfo/Pacific/Auckland \ + ${datadir}/zoneinfo/Pacific/Fiji \ + ${datadir}/zoneinfo/Pacific/Guam \ + ${datadir}/zoneinfo/Pacific/Honolulu \ + ${datadir}/zoneinfo/Pacific/Kwajalein \ + ${datadir}/zoneinfo/Pacific/Midway \ + ${datadir}/zoneinfo/Pacific/Pacific/Norfolk \ + ${datadir}/zoneinfo/Pacific/Tongatapu \ + ${sysconfdir}/localtime \ + ${sysconfdir}/timezone " + +PACKAGES += "${PN}-base" + +FILES_${PN}-base = "${datadir}/zoneinfo" diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink/fix_dvbaudiosink_async_opt.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink/fix_dvbaudiosink_async_opt.patch new file mode 100755 index 0000000..2961c28 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink/fix_dvbaudiosink_async_opt.patch @@ -0,0 +1,19 @@ +commit 962f9068bfd74aefe65a63ccdd89e417ef2ca827 +Author: Chang.H.S +Date: Mon Dec 10 16:07:30 2012 +0900 + + 2 + +diff --git a/src/gstdvbaudiosink.c b/src/gstdvbaudiosink.c +index 0966d33..ff54ab6 100644 +--- a/src/gstdvbaudiosink.c ++++ b/src/gstdvbaudiosink.c +@@ -354,7 +354,7 @@ gst_dvbaudiosink_init (GstDVBAudioSink *klass, GstDVBAudioSinkClass * gclass) + klass->dump_filename = NULL; + + gst_base_sink_set_sync (GST_BASE_SINK(klass), FALSE); +- gst_base_sink_set_async_enabled (GST_BASE_SINK(klass), TRUE); ++ gst_base_sink_set_async_enabled (GST_BASE_SINK(klass), FALSE); + } + + static void diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink/fix_dvbvideosink_dm8000_padtemplate.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink/fix_dvbvideosink_dm8000_padtemplate.patch new file mode 100644 index 0000000..c0520b3 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink/fix_dvbvideosink_dm8000_padtemplate.patch @@ -0,0 +1,21 @@ +commit 34a5871e18b59f852a86ac131dba020b31d0ba0e +Author: Chang.H.S +Date: Mon Dec 10 16:06:20 2012 +0900 + + 1 + +diff --git a/src/gstdvbvideosink.c b/src/gstdvbvideosink.c +index fcd8fed..b3ce35f 100644 +--- a/src/gstdvbvideosink.c ++++ b/src/gstdvbvideosink.c +@@ -316,8 +316,8 @@ gst_dvbvideosink_base_init (gpointer klass) + GST_INFO ("model is DM7020HD... set bcm7405 caps"); + } else if ( !strncasecmp(string, "DM8000", 6) ) { + hwtype = DM8000; +- hwtemplate = &sink_factory_bcm7400; +- GST_INFO ("model is DM8000... set bcm7400 caps"); ++ hwtemplate = &sink_factory_bcm7405; ++ GST_INFO ("model is DM8000... set bcm7405 caps"); + } else if ( !strncasecmp(string, "DM800", 5) ) { + hwtype = DM800; + hwtemplate = &sink_factory_bcm7401; diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb index 11febfc..e1070bd 100644 --- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb @@ -1,15 +1,28 @@ SUMMARY = "Plugin for gstreamer: dvbmediasink" SECTION = "multimedia" +MAINTAINER = "Felix Domke " LICENSE = "MIT | LGPLv2.1" -LIC_FILES_CHKSUM = "file://src/gstdvbaudiosink.c;beginline=1;endline=45;md5=023ebb8eaef9b8cce8591a9d96638392 \ - file://src/gstdvbvideosink.c;beginline=1;endline=44;md5=b597d3f0a4e3b49db42d2b5140bd7004" +LIC_FILES_CHKSUM = "file://src/gstdvbaudiosink.c;md5=1b3d0c8e4a67b80e29e1a8bf0e7d568c \ + file://src/gstdvbvideosink.c;md5=01003daf0d4030982ef58f3f8540bd33" + DEPENDS = "gstreamer gst-plugins-base" -SRCREV = "1bc9f47255396df4b3119a02790c4e864566560a" -PR = "r5" -SCHWERKRAFT_PROJECT = "dvbmediasink" +#SRCREV="15a323fd769d4546bc454bfd81848aa43d655f3d" +SRCREV="1bc9f47255396df4b3119a02790c4e864566560a" +SRCDATE="20110210" +BRANCH="master" +PV = "0.10+git${SRCDATE}" +PR = "r6" + +inherit autotools pkgconfig +SRC_URI = "git://schwerkraft.elitedvb.net/dvbmediasink/dvbmediasink.git;protocol=git;branch=${BRANCH};tag=${SRCREV}" + +SRC_URI_append_vuplus = " \ + file://fix_dvbaudiosink_async_opt.patch;patch=1;pnum=1 \ + file://fix_dvbvideosink_dm8000_padtemplate.patch;patch=1;pnum=1 \ + " -inherit autotools schwerkraft-git +S = "${WORKDIR}/git" FILES_${PN} = "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/disable-vorbis-encoder.patch b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/disable-vorbis-encoder.patch new file mode 100644 index 0000000..da59391 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/disable-vorbis-encoder.patch @@ -0,0 +1,54 @@ +--- a/configure.ac 2012-08-25 00:33:07.000000000 +0200 ++++ b/configure.ac 2012-08-25 00:34:12.730232665 +0200 +@@ -806,7 +806,7 @@ + dnl AM_PATH_VORBIS only takes two options + translit(dnm, m, l) AM_CONDITIONAL(USE_VORBIS, true) + AG_GST_CHECK_FEATURE(VORBIS, [Xiph Vorbis audio codec], vorbis, [ +- AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0 vorbisenc >= 1.0) ++ AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0) + if test $HAVE_VORBIS = no + then + XIPH_PATH_VORBIS(HAVE_VORBIS="yes", HAVE_VORBIS="no") +--- a/ext/vorbis/gstvorbis.c 2012-08-25 00:34:05.086232463 +0200 ++++ b/ext/vorbis/gstvorbis.c 2012-08-25 00:33:32.000000000 +0200 +@@ -36,10 +36,6 @@ + static gboolean + plugin_init (GstPlugin * plugin) + { +- if (!gst_element_register (plugin, "vorbisenc", GST_RANK_PRIMARY, +- GST_TYPE_VORBISENC)) +- return FALSE; +- + if (!gst_element_register (plugin, "vorbisdec", GST_RANK_PRIMARY, + gst_vorbis_dec_get_type ())) + return FALSE; +@@ -52,8 +48,6 @@ + gst_vorbis_tag_get_type ())) + return FALSE; + +- GST_DEBUG_CATEGORY_INIT (vorbisenc_debug, "vorbisenc", 0, +- "vorbis encoding element"); + GST_DEBUG_CATEGORY_INIT (vorbisdec_debug, "vorbisdec", 0, + "vorbis decoding element"); + GST_DEBUG_CATEGORY_INIT (vorbisparse_debug, "vorbisparse", 0, +--- a/ext/vorbis/Makefile.am 2012-08-25 00:34:05.086232463 +0200 ++++ b/ext/vorbis/Makefile.am 2012-08-25 00:33:32.000000000 +0200 +@@ -6,7 +6,6 @@ + libgstvorbis_la_SOURCES = gstvorbis.c \ + gstvorbisdec.c \ + gstvorbisdeclib.c \ +- gstvorbisenc.c \ + gstvorbisparse.c \ + gstvorbistag.c \ + gstvorbiscommon.c +--- a/m4/vorbis.m4 2012-08-25 00:34:05.086232463 +0200 ++++ b/m4/vorbis.m4 2012-08-25 00:33:32.000000000 +0200 +@@ -26,7 +26,7 @@ + + VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" + VORBISFILE_LIBS="-lvorbisfile" +- VORBISENC_LIBS="-lvorbisenc" ++ VORBISENC_LIBS="" + + if test "x$vorbis_includes" != "x" ; then + VORBIS_CFLAGS="-I$vorbis_includes" diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend index f27d55a..a0a4798 100644 --- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend @@ -1,7 +1,8 @@ DEPENDS += "cdparanoia orc orc-native" -PR .= "-vuplus0" +PR .= "-vuplus1" -SRC_URI += "file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch" +SRC_URI += "file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \ + file://disable-vorbis-encoder.patch" EXTRA_OECONF += "--enable-orc" diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb new file mode 100755 index 0000000..9a34d2d --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb @@ -0,0 +1,15 @@ +DESCRIPTION="AiO screen grabber" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" + +PR = "r1" +PV = "0.8+cvs${SRCDATE}" +SRCDATE = "20101123" + +SRC_URI="cvs://anonymous@cvs.schwerkraft.elitedvb.net/cvsroot/aio-grab;module=aio-grab;method=pserver" +SRC_URI_append_vuplus = "\ + file://aio-grab_vuplus.patch;patch=1" + +S = "${WORKDIR}/aio-grab" + +inherit autotools pkgconfig diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus.patch b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus.patch index 1459e22..b9f4039 100644 --- a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus.patch +++ b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus.patch @@ -1,94 +1,189 @@ diff --git a/main.c b/main.c -index 190ff5f..08298e9 100644 +index ffff998..4bf7327 100644 --- a/main.c +++ b/main.c -@@ -101,8 +101,8 @@ static void combine(unsigned char *output, - const unsigned char *video, const unsigned char *osd, - unsigned int xres, unsigned int yres); +@@ -86,8 +86,8 @@ void (*resize)(unsigned char *source, unsigned char *dest, int xsource, int ysou + void combine(unsigned char *output, unsigned char *video, unsigned char *osd, int xres, int yres); + char* upcase(char* mixedstr); -enum {UNKNOWN,PALLAS,VULCAN,XILLEON,BRCM7401,BRCM7400,BRCM7405}; --static const char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405"}; -+enum {UNKNOWN,PALLAS,VULCAN,XILLEON,BRCM7401,BRCM7400,BRCM7405,BRCM7335,BRCM7325}; -+static const char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405","Brcm7335","Brcm7325"}; - static int stb_type=UNKNOWN; +-char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405"}; ++enum {UNKNOWN,PALLAS,VULCAN,XILLEON,BRCM7401,BRCM7400,BRCM7405,BRCM7335,BRCM7325,BRCM7346,BRCM7425}; ++char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405","Brcm7335","Brcm7325","Brcm7346","Brcm7425"}; + int stb_type=UNKNOWN; - static const char *file_getline(const char *filename) -@@ -221,6 +221,22 @@ int main(int argc, char **argv) { - !strcmp(line, "dm800se") || - !strcmp(line, "dm7020hd")) - stb_type = BRCM7405; + // main program +@@ -139,6 +139,53 @@ int main(int argc, char **argv) { + stb_type=BRCM7405; + } + pclose(pipe); + + // CPU Detection. idea from pl -+ if (line != NULL) -+ free(line); -+ line = file_getline("/proc/stb/info/chipset"); -+ if(line) ++ pipe=popen("cat /proc/stb/info/chipset","r"); ++ if(pipe) + { -+ if (!strcmp(line, "7335")) -+ stb_type = BRCM7335; -+ else if (!strcmp(line, "7325")) -+ stb_type = BRCM7325; -+ else if (!strcmp(line, "7405")) -+ stb_type = BRCM7405; ++ while (fgets(buf,sizeof(buf),pipe)) ++ { ++ if (strstr(upcase(buf),"7335")) ++ { ++ stb_type=BRCM7335; ++ break; ++ } ++ else if (strstr(upcase(buf),"7325")) ++ { ++ stb_type=BRCM7325; ++ break; ++ } ++ else if (strstr(upcase(buf),"7405")) ++ { ++ stb_type=BRCM7405; ++ break; ++ } ++ else if (strstr(upcase(buf),"7356")) ++ { ++ stb_type=BRCM7346; ++ break; ++ } ++ else if (strstr(upcase(buf),"7346")) ++ { ++ stb_type=BRCM7346; ++ break; ++ } ++ ++ else if (strstr(upcase(buf),"7424")) ++ { ++ stb_type=BRCM7425; ++ break; ++ } ++ else if (strstr(upcase(buf),"7425")) ++ { ++ stb_type=BRCM7425; ++ break; ++ } ++ ++ } + } -+ free(line); -+ - } else if (strstr(line, "xilleonfb")) { - stb_type = XILLEON; - } else if (strstr(line, "Pallas FB")) { -@@ -564,7 +580,7 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre - return false; ++ pclose(pipe); } + if (stb_type == UNKNOWN) +@@ -491,15 +538,27 @@ void getvideo(unsigned char *video, int *xres, int *yres) + char buf[256]; + FILE *pipe; + - if (stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405) -+ if (stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325) ++ if (stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425) { // grab brcm7401 pic from decoder memory - unsigned char *memory = mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, 0x10100000); -@@ -609,7 +625,7 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre - assert(chroma); + +- if(!(memory = (unsigned char*)mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, 0x10100000))) ++ if(stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325) + { +- printf("Mainmemory: \n"); +- return; ++ if(!(memory = (unsigned char*)mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, 0x10100000))) ++ { ++ printf("Mainmemory: \n"); ++ return; ++ } ++ } ++ else ++ { ++ if(!(memory = (unsigned char*)mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, 0x10600000))) ++ { ++ printf("Mainmemory: \n"); ++ return; ++ } + } ++ + + unsigned char data[100]; + +@@ -509,17 +568,31 @@ void getvideo(unsigned char *video, int *xres, int *yres) + memcpy(data,memory,100); + //vert_start=data[0x1B]<<8|data[0x1A]; + //vert_end=data[0x19]<<8|data[0x18]; +- stride=data[0x15]<<8|data[0x14]; +- ofs=(data[0x28]<<8|data[0x27])>>4; +- ofs2=(data[0x2c]<<8|data[0x2b])>>4; +- adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00; +- adr2=(data[0x23]<<24|data[0x22]<<16|data[0x21]<<8|data[0x20])&0xFFFFFF00; +- offset=adr2-adr; ++ if(stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325) ++ { ++ stride=data[0x15]<<8|data[0x14]; ++ ofs=(data[0x28]<<8|data[0x27])>>4; ++ ofs2=(data[0x2c]<<8|data[0x2b])>>4; ++ adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00; ++ adr2=(data[0x23]<<24|data[0x22]<<16|data[0x21]<<8|data[0x20])&0xFFFFFF00; ++ offset=adr2-adr; ++ } ++ else ++ { ++ stride=data[0x15]<<8|data[0x14]; ++ ofs=(data[0x3c]<<8|data[0x3b])>>4; ++ ofs2=(data[0x40]<<8|data[0x3f])>>4; ++ adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00; ++ adr2=(data[0x37]<<24|data[0x36]<<16|data[0x35]<<8|data[0x34])&0xFFFFFF00; ++ offset=adr2-adr; ++ ++ } ++ + + munmap(memory, 100); + +- // printf("Stride: %d Res: %d\n",stride,res); +- // printf("Adr: %X Adr2: %X OFS: %d %d\n",adr,adr2,ofs,ofs2); ++ printf("Stride: %d Res: %d\n",stride,res); ++ printf("Adr: %X Adr2: %X OFS: %d %d\n",adr,adr2,ofs,ofs2); + + pipe=popen("cat /proc/stb/vmpeg/0/yres","r"); + while (fgets(buf,sizeof(buf),pipe)) +@@ -530,7 +603,7 @@ void getvideo(unsigned char *video, int *xres, int *yres) + chroma = (unsigned char *)malloc(stride*(ofs2+64)); // grabbing luma & chroma plane from the decoder memory -- if (stb_type == BRCM7401 || stb_type == BRCM7405) { -+ if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325) { +- if (stb_type == BRCM7401 || stb_type == BRCM7405) ++ if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425) + { // on dm800/dm500hd we have direct access to the decoder memory - memory = mmap(0, offset + stride*(ofs2+64), PROT_READ, MAP_SHARED, mem_fd, adr); - if (memory == MAP_FAILED) { -@@ -620,7 +636,7 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre - usleep(50000); // we try to get a full picture, its not possible to get a sync from the decoder so we use a delay - // and hope we get a good timing. dont ask me why, but every DM800 i tested so far produced a good - // result with a 50ms delay -- } else if (stb_type == BRCM7400) { -+ } else if (stb_type == BRCM7400 || stb_type == BRCM7335) { + if(!(memory_tmp = (unsigned char*)mmap(0, offset + stride*(ofs2+64), PROT_READ, MAP_SHARED, mem_fd, adr))) +@@ -543,7 +616,7 @@ void getvideo(unsigned char *video, int *xres, int *yres) + // and hope we get a good timing. dont ask me why, but every DM800 i tested so far produced a good + // result with a 50ms delay + +- } else if (stb_type == BRCM7400) ++ } else if (stb_type == BRCM7400 || stb_type == BRCM7335) + { // on dm8000 we have to use dma, so dont change anything here until you really know what you are doing ! - unsigned int i = 0; -@@ -640,6 +656,7 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre - +@@ -553,7 +626,7 @@ void getvideo(unsigned char *video, int *xres, int *yres) + return; + } volatile unsigned long *mem_dma; - mem_dma = mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, 0x10c02000); -+ mem_dma = mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, (stb_type==BRCM7400)? 0x10c02000:0x10c01000); - if (mem_dma == MAP_FAILED) { - perror("mmap"); - return false; -@@ -676,7 +693,7 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre - unsigned int chr_luma_stride = 0x40; - unsigned int sw; +- if(!(mem_dma = (volatile unsigned long*)mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, 0x10c02000))) ++ if(!(mem_dma = (volatile unsigned long*)mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, (stb_type==BRCM7400)? 0x10c02000:0x10c01000))) + { + printf("Mainmemory: \n"); + return; +@@ -595,7 +668,7 @@ void getvideo(unsigned char *video, int *xres, int *yres) + int chr_luma_stride = 0x40; + int sw=1; - if (stb_type == BRCM7405) -+ if (stb_type == BRCM7405 || stb_type == BRCM7325) ++ if (stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425) chr_luma_stride *= 2; xsub=chr_luma_stride; -@@ -711,9 +728,9 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre +@@ -630,9 +703,9 @@ void getvideo(unsigned char *video, int *xres, int *yres) } } - if (stb_type == BRCM7401 || stb_type == BRCM7405) -+ if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325) - munmap(memory, offset + stride * (ofs2 + 64)); -- else if (stb_type == BRCM7400) { -+ else if (stb_type == BRCM7400 || stb_type == BRCM7335) { - memory -= 0x1000; - munmap(memory, DMA_BLOCKSIZE + 0x1000); - } ++ if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425) + munmap(memory_tmp, offset + stride*(ofs2+64)); +- else if (stb_type == BRCM7400) ++ else if (stb_type == BRCM7400 || stb_type == BRCM7335) + munmap(memory_tmp, DMA_BLOCKSIZE + 0x1000); + + for (t=0; t< stride*ofs;t+=4) diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab_0.8.bb b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab_0.8.bb deleted file mode 100644 index bc89b2d..0000000 --- a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab_0.8.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "Screen grabber for Dreambox Set-Top-Boxes" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" -SRCREV = "8394e1ba98c73d7c56d3235ef16cce253dc597cd" -PR = "r1" - -inherit autotools schwerkraft-git diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab_0.8.bbappend b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab_0.8.bbappend deleted file mode 100644 index 9199d4a..0000000 --- a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab_0.8.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -PR .= "-vuplus0" - -SRC_URI += " \ - file://aio-grab_vuplus.patch;patch=1;pnum=1 \ -" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index bd6d959..8fadfd6 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -6,11 +6,9 @@ DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \ dreambox-dvbincludes freetype libdvbsi++ python swig-native \ libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \ gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi \ - hostap-daemon bridge-utils \ + hostap-daemon bridge-utils ntfs-3g dosfstools \ " -# DEPENDS += "wvdial wvstreams ppp usbmodeswitch usbmodeswitch-data djmount minidlna" - RDEPENDS_GST= "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \ gst-plugins-good-id3demux gst-plugins-ugly-mad gst-plugins-base-ogg gst-plugins-base-playbin \ gst-plugins-base-typefindfunctions gst-plugins-base-audioconvert gst-plugins-base-audioresample \ @@ -81,8 +79,10 @@ RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv" DEPENDS += "wvdial wvstreams ppp usb-modeswitch usb-modeswitch-data" RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-modeswitch-data wvdial wvstreams kernel-module-usbserial" +RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools" + PN = "enigma2" -PR = "r40" +PR = "r43" SRCDATE = "20121128" #SRCDATE is NOT used by git to checkout a specific revision diff --git a/meta-openvuplus/recipes-vuplus/fakelocale/fakelocale.bb b/meta-openvuplus/recipes-vuplus/fakelocale/fakelocale.bb index aa50ca6..c16741a 100644 --- a/meta-openvuplus/recipes-vuplus/fakelocale/fakelocale.bb +++ b/meta-openvuplus/recipes-vuplus/fakelocale/fakelocale.bb @@ -2,11 +2,14 @@ SUMMARY = "Fake locale support" LICENSE = "CLOSED" SECTION = "base" PRIORITY = "required" -PR = "r3" - -SRC_URI = "http://sources.dreamboxupdate.com/download/opendreambox/fakelocale.tar.gz file://locale.alias" -SRC_URI[md5sum] = "d11a901c9e4dc2947cbc560044de2b67" -SRC_URI[sha256sum] = "b424804aff7a23efaa1fa25d27a55ac25173d0e7e95d07fe31096250bb498cc6" +PR = "r4" + +SRC_URI = " \ + file://fakelocale.tar.gz \ + file://locale.alias \ +" +SRC_URI[md5sum] = "bb4aeb4cbab20e7a6b4a320b4e315e7b" +SRC_URI[sha256sum] = "03247627d6d324c26e29c4823a80d120512fb382334eecbb04568eff30074120" S = "${WORKDIR}/fakelocale" diff --git a/meta-openvuplus/recipes-vuplus/fakelocale/files/fakelocale.tar.gz b/meta-openvuplus/recipes-vuplus/fakelocale/files/fakelocale.tar.gz new file mode 100644 index 0000000..26c2405 Binary files /dev/null and b/meta-openvuplus/recipes-vuplus/fakelocale/files/fakelocale.tar.gz differ diff --git a/meta-openvuplus/recipes-vuplus/fakelocale/files/locale.alias b/meta-openvuplus/recipes-vuplus/fakelocale/files/locale.alias index b66b1eb..bffcb29 100644 --- a/meta-openvuplus/recipes-vuplus/fakelocale/files/locale.alias +++ b/meta-openvuplus/recipes-vuplus/fakelocale/files/locale.alias @@ -1,28 +1,35 @@ -English C +English en_EN +Deutsch de_DE Arabic ar_AE +Bulgarian bg_BG +Catalan ca_AD +Croatia hr_HR Czech cs_CZ Danish da_DK -Deutsch de_DE -Ellinika el_GR -Spanish es_ES +Dutch nl_NL Estonian et_EE Suomi fi_FI French fr_FR -Frisian fy_FY -Croatia hr_HR +Ellinika el_GR +Frisian fy_NL +Hebrew he_IL Hungarian hu_HU +Lithuanian lt_LT +Latvian lv_LV Icelandic is_IS Italian it_IT -Lithuanian lt_LT -Dutch nl_NL Norwegian no_NO +Persian fa_IR Polish pl_PL Portugues pt_PT Romania ro_RO Russian ru_RU +Serbian sr_YU Slovakian sk_SK Slovenian sl_SI -Serbian sr_YU +Spanish es_ES Svenska sv_SE +Thailand th_TH Turkish tr_TR -Urdu ur_IN \ No newline at end of file +Ukrainian uk_UA +India ur_IN diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc index c3968d6..a138a79 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc @@ -2,7 +2,7 @@ SUMMARY = "Vuplus: Base Task for Vuplus." SECTION = "vuplus/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -INC_PR = "r0" +INC_PR = "r1" inherit task @@ -14,7 +14,7 @@ VUPLUS_BASE_ESSENTIAL = "\ e2fsprogs-mke2fs \ fakelocale \ opkg \ - timezones-alternative \ + tzdata \ tuxbox-common \ util-linux-sfdisk \ vsftpd \ diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc index d93ba90..ad0eb50 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc @@ -2,7 +2,7 @@ SUMMARY = "Enigma2 Task for Vuplus" SECTION = "vuplus/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -INC_PR = "r1" +INC_PR = "r3" inherit task @@ -25,6 +25,7 @@ RDEPENDS_${PN} += " \ enigma2-plugin-extensions-addstreamurl \ enigma2-plugin-extensions-remotestreamconvert \ vuplus-blindscan-utils \ + enigma2-plugin-systemplugins-devicemanager \ " RDEPENDS_${PN} += " \ @@ -37,6 +38,7 @@ RDEPENDS_${PN} += " \ ${@base_contains("MACHINE_FEATURES", "wifi", "task-vuplus-wlan", "", d)} \ enigma2-plugin-extensions-mediaplayer \ enigma2-plugin-extensions-pictureplayer \ + enigma2-plugin-extensions-vuplusevent \ enigma2-plugin-systemplugins-skinselector \ enigma2-plugin-systemplugins-ui3dsetup \ enigma2-plugin-systemplugins-uipositionsetup \ diff --git a/meta-openvuplus/recipes-vuplus/timezones/files/GPL-1.0 b/meta-openvuplus/recipes-vuplus/timezones/files/GPL-1.0 deleted file mode 100644 index 9d4ef93..0000000 --- a/meta-openvuplus/recipes-vuplus/timezones/files/GPL-1.0 +++ /dev/null @@ -1,252 +0,0 @@ - -GNU General Public License, version 1 - - GNU GENERAL PUBLIC LICENSE - Version 1, February 1989 - - Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The license agreements of most software companies try to keep users -at the mercy of those companies. By contrast, our General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. The -General Public License applies to the Free Software Foundation`s -software and to any other program whose authors commit to using it. -You can use it for your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Specifically, the General Public License is designed to make -sure that you have the freedom to give away or sell copies of free -software, that you receive source code or can get it if you want it, -that you can change the software or use pieces of it in new free -programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of a such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must tell them their rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author`s protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors` reputations. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any program or other work which -contains a notice placed by the copyright holder saying it may be -distributed under the terms of this General Public License. The -"Program", below, refers to any such program or work, and a "work based -on the Program" means either the Program or any work containing the -Program or a portion of it, either verbatim or with modifications. Each -licensee is addressed as "you". - - 1. You may copy and distribute verbatim copies of the Program`s source -code as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this -General Public License and to the absence of any warranty; and give any -other recipients of the Program a copy of this General Public License -along with the Program. You may charge a fee for the physical act of -transferring a copy. - - 2. You may modify your copy or copies of the Program or any portion of -it, and copy and distribute such modifications under the terms of Paragraph -1 above, provided that you also do the following: - - a) cause the modified files to carry prominent notices stating that - you changed the files and the date of any change; and - - b) cause the whole of any work that you distribute or publish, that - in whole or in part contains the Program or any part thereof, either - with or without modifications, to be licensed at no charge to all - third parties under the terms of this General Public License (except - that you may choose to grant warranty protection to some or all - third parties, at your option). - - c) If the modified program normally reads commands interactively when - run, you must cause it, when started running for such interactive use - in the simplest and most usual way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this General - Public License. - - d) You may charge a fee for the physical act of transferring a - copy, and you may at your option offer warranty protection in - exchange for a fee. - -Mere aggregation of another independent work with the Program (or its -derivative) on a volume of a storage or distribution medium does not bring -the other work under the scope of these terms. - - 3. You may copy and distribute the Program (or a portion or derivative of -it, under Paragraph 2) in object code or executable form under the terms of -Paragraphs 1 and 2 above provided that you also do one of the following: - - a) accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of - Paragraphs 1 and 2 above; or, - - b) accompany it with a written offer, valid for at least three - years, to give any third party free (except for a nominal charge - for the cost of distribution) a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of - Paragraphs 1 and 2 above; or, - - c) accompany it with the information you received as to where the - corresponding source code may be obtained. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form alone.) - -Source code for a work means the preferred form of the work for making -modifications to it. For an executable file, complete source code means -all the source code for all modules it contains; but, as a special -exception, it need not include source code for modules which are standard -libraries that accompany the operating system on which the executable -file runs, or for standard header files or definitions files that -accompany that operating system. - - 4. You may not copy, modify, sublicense, distribute or transfer the -Program except as expressly provided under this General Public License. -Any attempt otherwise to copy, modify, sublicense, distribute or transfer -the Program is void, and will automatically terminate your rights to use -the Program under this License. However, parties who have received -copies, or rights to use copies, from you under this General Public -License will not have their licenses terminated so long as such parties -remain in full compliance. - - 5. By copying, distributing or modifying the Program (or any work based -on the Program) you indicate your acceptance of this license to do so, -and all its terms and conditions. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the original -licensor to copy, distribute or modify the Program subject to these -terms and conditions. You may not impose any further restrictions on the -recipients` exercise of the rights granted herein. - - 7. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of the license which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -the license, you may choose any version ever published by the Free Software -Foundation. - - 8. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to humanity, the best way to achieve this is to make it -free software which everyone can redistribute and change under these -terms. - - To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively convey -the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 1, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19xx name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w`. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c` for details. - -The hypothetical commands `show w` and `show c` should show the -appropriate parts of the General Public License. Of course, the -commands you use may be called something other than `show w` and `show -c`; they could even be mouse-clicks or menu items--whatever suits your -program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision` (a program to direct compilers to make passes - at assemblers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -That`s all there is to it! - diff --git a/meta-openvuplus/recipes-vuplus/timezones/files/zoneinfo.tar.bz2 b/meta-openvuplus/recipes-vuplus/timezones/files/zoneinfo.tar.bz2 deleted file mode 100644 index 19fa928..0000000 Binary files a/meta-openvuplus/recipes-vuplus/timezones/files/zoneinfo.tar.bz2 and /dev/null differ diff --git a/meta-openvuplus/recipes-vuplus/timezones/timezones-alternative.bb b/meta-openvuplus/recipes-vuplus/timezones/timezones-alternative.bb deleted file mode 100644 index 0fb50f3..0000000 --- a/meta-openvuplus/recipes-vuplus/timezones/timezones-alternative.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Timezone data, alternative" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "Felix Domke " -LICENSE = "GPL" -LIC_FILES_CHKSUM = "file://${THISDIR}/files/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" - -PV = "2008i" -PR = "r0" - -SRC_URI = "file://zoneinfo.tar.bz2" -S = "${WORKDIR}/zoneinfo" - -FILES_${PN} = "usr/share/zoneinfo/[A-Z]*" -PACKAGE_ARCH = "all" - -do_install() { - install -d ${D}/usr/share/zoneinfo/ - - for file in ${S}/* - do - [ -f $file ] && install -m 644 "$file" ${D}/usr/share/zoneinfo/ - done; - true; -}