From: Chang.H.S Date: Tue, 11 Dec 2012 06:03:58 +0000 (+0900) Subject: Merge branch 'master' into obi X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=a6b296b9f0504de63a1a852ff472a8ec4197c4df;hp=2855c0eb464258ae54578561d24ec58593a2f4ad Merge branch 'master' into obi --- diff --git a/Makefile b/Makefile index a738219..c2c02b5 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ # for the vuultimo, if it is not the default. MACHINE ?= vuultimo -MULTI_TEMPORARILY ?= +MULTI_TEMPORARILY ?= YES # Adjust according to the number CPU cores to use for parallel build. # Default: Number of processors in /proc/cpuinfo, if present, or 1. diff --git a/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend index 7f2bdd8..386ae61 100644 --- a/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend +++ b/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend @@ -1,4 +1,4 @@ -SRCDATE = "20120628" +SRCDATE = "20121025" MODULES_NAME = "procmk\ndvb-bcm7335\nbrcmfb" diff --git a/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb b/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb new file mode 100755 index 0000000..e2c93f4 --- /dev/null +++ b/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Utilities for transponder & dvb-s blindscan" +SECTION = "base" +PRIORITY = "optional" +RDEPENDS = "ncurses" + +LICENSE = "CLOSED" + +PV = "3.1" +PR = "r0" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI = "http://archive.vuplus.com/download/utils/vuplus-blindscan-utils-${MACHINE}-${PV}.tar.bz2" + +S = "${WORKDIR}/blindscan-utils" + +do_install() { + install -d ${D}/${bindir}/ + for i in `find ${S} -type f -maxdepth 1`; do + install -m 0755 $i ${D}/${bindir}/; + done; +} diff --git a/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend index ae09a3c..f0f056c 100644 --- a/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend +++ b/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend @@ -1,4 +1,4 @@ -SRCDATE = "20120628" +SRCDATE = "20121025" MODULES_NAME = "procmk\ndvb-bcm7325\nbrcmfb" diff --git a/meta-bsp/vuultimo/conf/machine/vuultimo.conf b/meta-bsp/vuultimo/conf/machine/vuultimo.conf index 416635c..43c30b3 100644 --- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf +++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf @@ -7,6 +7,13 @@ MACHINE_FEATURES += "right-half-vfd-skin" MACHINE_FEATURES += "enable-rc-kbd" VUPLUS_FEATURES = "fan_manual rc_code led" +VUPLUS_FEATURES += "blindscan" +VUPLUS_FEATURES += "firmwareupgrade" +VUPLUS_FEATURES += "hbbtv" +VUPLUS_FEATURES += "streamtv" +VUPLUS_FEATURES += "dlna" +VUPLUS_FEATURES += "3gmodem" + IMAGE_UNPACK_PATH = "vuplus/ultimo" MKFS_UBI_MAX_ERASE_BLK_COUNT = "3894" diff --git a/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend index aa16d12..476804a 100644 --- a/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend +++ b/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend @@ -1,4 +1,4 @@ -SRCDATE = "20120628" +SRCDATE = "20121025" MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc" diff --git a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend index f156dff..43cdf02 100644 --- a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend +++ b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend @@ -1,4 +1,4 @@ -SRCDATE = "20120628" +SRCDATE = "20121025" MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc" diff --git a/meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb b/meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb new file mode 100644 index 0000000..9dd1cae --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "mount UPnP server content as a linux filesystem" +HOMEPAGE = "http://djmount.sourceforge.net/" +LICENSE = "GPLv2+" +DEPENDS = "libupnp fuse" +RDEPENDS_${PN} = "fuse" +PR = "r4" + +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +INITSCRIPT_NAME = "djmount" +INITSCRIPT_PARAMS = "defaults" + +inherit autotools + +EXTRA_OECONF = "--with-external-libupnp --with-fuse-prefix='${STAGING_LIBDIR}'" + +SRC_URI = "${SOURCEFORGE_MIRROR}/djmount/djmount-0.71.tar.gz \ + file://configure.ac.patch \ + file://rt_bool_arg_enable.m4.patch \ + " + +SRC_URI[md5sum] = "c922753e706c194bf82a8b6ca77e6a9a" +SRC_URI[sha256sum] = "aa5bb482af4cbd42695a7e396043d47b53d075ac2f6aa18a8f8e11383c030e4f" + +do_configure_prepend() { + cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/libupnp/config.aux/config.rpath +} + diff --git a/meta-openvuplus/recipes-connectivity/djmount/files/configure.ac.patch b/meta-openvuplus/recipes-connectivity/djmount/files/configure.ac.patch new file mode 100644 index 0000000..6f9592e --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/djmount/files/configure.ac.patch @@ -0,0 +1,12 @@ +--- djmount-0.71/configure.ac.orig 2006-08-27 22:12:33.000000000 +0200 ++++ djmount-0.71/configure.ac 2012-04-19 08:56:31.412327597 +0200 +@@ -14,8 +14,8 @@ + # share auxiliary files with sub-configure in "libupnp" + AC_CONFIG_AUX_DIR(libupnp/config.aux) + AC_CONFIG_MACRO_DIR(libupnp/m4) +-AC_CONFIG_MACRO_DIR(m4) + AC_CONFIG_MACRO_DIR(gl/m4) ++AC_CONFIG_MACRO_DIR(m4) + + AC_CONFIG_SRCDIR(djmount/djfs.c) + diff --git a/meta-openvuplus/recipes-connectivity/djmount/files/rt_bool_arg_enable.m4.patch b/meta-openvuplus/recipes-connectivity/djmount/files/rt_bool_arg_enable.m4.patch new file mode 100644 index 0000000..57a1678 --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/djmount/files/rt_bool_arg_enable.m4.patch @@ -0,0 +1,11 @@ +--- djmount-0.71/libupnp/m4/rt_bool_arg_enable.m4.orig 2006-08-27 22:12:21.000000000 +0200 ++++ djmount-0.71/libupnp/m4/rt_bool_arg_enable.m4 2012-04-20 11:15:34.184722609 +0200 +@@ -34,7 +34,7 @@ + )]) + test "x$enable_[$1]" != [x]m4_if([$2],[yes],[no],[yes]) dnl + && enable_[]Name=[$2] +- AC_MSG_RESULT($enable_[]Name)dnl ++ AC_MSG_RESULT($enable_[]Name) + AM_CONDITIONAL([ENABLE_]NAME, test x"$enable_[]Name" = xyes) + dnl + m4_popdef([NAME])dnl diff --git a/meta-openvuplus/recipes-connectivity/libupnp/libupnp_1.6.5.bb b/meta-openvuplus/recipes-connectivity/libupnp/libupnp_1.6.5.bb new file mode 100644 index 0000000..8140c4a --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/libupnp/libupnp_1.6.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "The portable SDK for UPnP* Devices (libupnp) provides developers with an API and open source code for building control points, devices, and bridges that are compliant with Version 1.0 of the Universal Plug and Play Device Architecture Specification." +HOMEPAGE = "http://pupnp.sourceforge.net/" +LICENSE = "BSD" + +LIC_FILES_CHKSUM = "file://upnp/LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863" + +PR = "r1" + +LEAD_SONAME = "libupnp" +SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${P}.tar.bz2" + +inherit autotools + +SRC_URI[md5sum] = "2b0370e7c405a5bc80880085e6d7d827" +SRC_URI[sha256sum] = "95b11e2db04c2e714c2f4fb05d9d31351d3388dababd4e1dd5300f4b0d5e8767" diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff new file mode 100644 index 0000000..e117d5d --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/default_sqlite_caches.diff @@ -0,0 +1,20 @@ +#Don't increase page_size and default_cache_size. +#This patch reduces the memory footprint by about 50% without any major performance hits. +Index: minidlna.c +=================================================================== +RCS file: /cvsroot/minidlna/minidlna/minidlna.c,v +retrieving revision 1.78 +diff -u -r1.78 minidlna.c +--- a/minidlna.c 10 Jan 2012 02:50:33 -0000 1.78 ++++ b/minidlna.c 23 Jan 2012 13:12:02 -0000 +@@ -320,10 +320,8 @@ + DPRINTF(E_FATAL, L_GENERAL, "ERROR: Failed to open sqlite database! Exiting...\n"); + } + sqlite3_busy_timeout(db, 5000); +- sql_exec(db, "pragma page_size = 4096"); + sql_exec(db, "pragma journal_mode = OFF"); + sql_exec(db, "pragma synchronous = OFF;"); +- sql_exec(db, "pragma default_cache_size = 8192;"); + return new_db; + } + diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf new file mode 100644 index 0000000..798d303 --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna/minidlna.conf @@ -0,0 +1,67 @@ +# port for HTTP (descriptions, SOAP, media transfer) traffic +port=8200 + +# network interfaces to serve, comma delimited +#network_interface=eth0 + +# set this to the directory you want scanned. +# * if have multiple directories, you can have multiple media_dir= lines +# * if you want to restrict a media_dir to a specific content type, you +# can prepend the type, followed by a comma, to the directory: +# + "A" for audio (eg. media_dir=A,/home/jmaggard/Music) +# + "V" for video (eg. media_dir=V,/home/jmaggard/Videos) +# + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures) +media_dir=/opt + +# set this if you want to customize the name that shows up on your clients +#friendly_name=My DLNA Server + +# set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache +#db_dir=/var/cache/minidlna + +# set this if you would like to specify the directory where you want MiniDLNA to store its log file +#log_dir=/var/log + +# set this to change the verbosity of the information that is logged +# each section can use a different level: off, fatal, error, warn, info, or debug +#log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn + +# this should be a list of file names to check for when searching for album art +# note: names should be delimited with a forward slash ("/") +album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg + +# set this to no to disable inotify monitoring to automatically discover new files +# note: the default is yes +inotify=yes + +# set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO +enable_tivo=no + +# set this to strictly adhere to DLNA standards. +# * This will allow server-side downscaling of very large JPEG images, +# which may hurt JPEG serving performance on (at least) Sony DLNA products. +strict_dlna=no + +# default presentation url is http address on port 80 +#presentation_url=http://www.mylan/index.php + +# notify interval in seconds. default is 895 seconds. +notify_interval=900 + +# serial and model number the daemon will report to clients +# in its XML description +serial=12345678 +model_number=1 + +# specify the path to the MiniSSDPd socket +#minissdpdsocket=/var/run/minissdpd.sock + +# use different container as root of the tree +# possible values: +# + "." - use standard container (this is the default) +# + "B" - "Browse Directory" +# + "M" - "Music" +# + "V" - "Video" +# + "P" - "Pictures" +# if you specify "B" and client device is audio-only then "Music/Folders" will be used as root +#root_container=. diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb new file mode 100644 index 0000000..860957b --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb @@ -0,0 +1,29 @@ +SUMMARY = "lightweight DLNA/UPnP-AV server targeted at embedded systems" +HOMEPAGE = "http://sourceforge.net/projects/minidlna/" +SECTION = "network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b1a795ac1a06805cf8fd74920bc46b5c" +DEPENDS = "libexif jpeg libid3tag flac libvorbis sqlite3 libav util-linux" +SRCDATE = "20120408" +PV = "1.0.99+cvs${SRCDATE}" +PR = "r3" + +SRC_URI = "cvs://anonymous@minidlna.cvs.sourceforge.net/cvsroot/minidlna;module=minidlna \ + file://default_sqlite_caches.diff \ + file://minidlna.conf \ + file://init" + +S = "${WORKDIR}/${PN}" + +inherit autotools gettext + +PACKAGES =+ "${PN}-utils" + +FILES_${PN}-utils = "${bindir}/test*" + +CONFFILES_${PN} = "${sysconfdir}/minidlna.conf" + +do_install_append() { + install -d ${D}${sysconfdir} + install -m 644 minidlna.conf ${D}${sysconfdir} +} diff --git a/meta-openvuplus/recipes-connectivity/usb-modeswitch/usb-modeswitch-data/usb-modeswitch-data_20120215.patch b/meta-openvuplus/recipes-connectivity/usb-modeswitch/usb-modeswitch-data/usb-modeswitch-data_20120215.patch new file mode 100644 index 0000000..72aa4e1 --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/usb-modeswitch/usb-modeswitch-data/usb-modeswitch-data_20120215.patch @@ -0,0 +1,15 @@ +diff --git a/usb_modeswitch.d/16d8:700b b/usb_modeswitch.d/16d8:700b +index 6e8179f..826a2cb 100644 +--- a/usb_modeswitch.d/16d8:700b ++++ b/usb_modeswitch.d/16d8:700b +@@ -1,6 +1,9 @@ + # C-motech CHU-629S (Variant) + +-TargetClass=0xff ++DefaultVendor= 0x16d8 ++DefaultProduct=0x700b + ++TargetClass=0xff ++CheckSuccess=20 + MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" + diff --git a/meta-openvuplus/recipes-connectivity/usb-modeswitch/usb-modeswitch-data_20121109.bb b/meta-openvuplus/recipes-connectivity/usb-modeswitch/usb-modeswitch-data_20121109.bb new file mode 100644 index 0000000..fcb2c90 --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/usb-modeswitch/usb-modeswitch-data_20121109.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Data files for usbmodeswitch" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit allarch + +SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2 \ + file://usb-modeswitch-data_20120215.patch;patch=1;pnum=1 \ + " + +do_install() { + oe_runmake install DESTDIR=${D} +} + +RDEPENDS_${PN} = "usb-modeswitch" +FILES_${PN} += "${base_libdir}/udev/rules.d/ \ + ${datadir}/usb_modeswitch" + +SRC_URI[md5sum] = "a7d23a03157871013a0d708ab2b1b6df" +SRC_URI[sha256sum] = "a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5" + diff --git a/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial-vuplus_001.patch b/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial-vuplus_001.patch new file mode 100644 index 0000000..f897a5c --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial-vuplus_001.patch @@ -0,0 +1,26 @@ +diff --git a/wvmodemscan.cc b/wvmodemscan.cc +index bf59924..ef5ab87 100644 +--- a/wvmodemscan.cc ++++ b/wvmodemscan.cc +@@ -485,6 +485,7 @@ const char *WvModemScan::is_isdn() const + + static int fileselect(const struct dirent *e) + { ++#if 0 + return !strncmp(e->d_name, "ttyS", 4) // serial + || !strncmp(e->d_name, "ttyLT", 5) // Lucent WinModem + || !strncmp(e->d_name, "ttyACM", 6) // USB acm Modems +@@ -493,6 +494,13 @@ static int fileselect(const struct dirent *e) + || !strncmp(e->d_name, "ttySL", 5); // SmartLink WinModem + + // (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4); ++#else ++ return !strncmp(e->d_name, "ttyLT", 5) // Lucent WinModem ++ || !strncmp(e->d_name, "ttyACM", 6) // USB acm Modems ++ || !strncmp(e->d_name, "ttyUSB", 6) // Modems on USB RS232 ++ || !strncmp(e->d_name, "ircomm", 6) // Handys over IrDA ++ || !strncmp(e->d_name, "ttySL", 5); // SmartLink WinModem ++#endif + } + + diff --git a/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb b/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb new file mode 100644 index 0000000..9e23e2a --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb @@ -0,0 +1,36 @@ +HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial" +DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet." + +PR = "r3" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" + +SRC_URI = "\ + http://www.alumnit.ca/download/wvdial-1.60.tar.gz \ + file://wvdial-vuplus_001.patch;patch=1 \ + " + +DEPENDS = "wvstreams ppp" +RDEPENDS = "ppp wvstreams" + +inherit autotools pkgconfig + +CFLAGS += " -Wno-write-strings " +LDFLAGS = " -L ${CROSS_DIR}/${TARGET_SYS}/usr/lib -luniconf -lwvstreams -lwvbase -lwvutils " + +EXTRA_OEMAKE = "" +export CC="${CXX}" + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}/etc/ppp/peers + oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers install +} + +SRC_URI[md5sum] = "27fbbde89f8fd9f6e735a8efa5217fc9" +SRC_URI[sha256sum] = "0c65ea807950fab32e659d1869a7167ff978502bd5d0159dbe9de90eb6c2e16b" + diff --git a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix.patch b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix.patch new file mode 100644 index 0000000..af9724c --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix.patch @@ -0,0 +1,27 @@ +diff --git a/ipstreams/wvunixdgsocket.cc b/ipstreams/wvunixdgsocket.cc +index 41d2911..e881ac0 100644 +--- a/ipstreams/wvunixdgsocket.cc ++++ b/ipstreams/wvunixdgsocket.cc +@@ -2,6 +2,9 @@ + #ifdef MACOS + #include + #include ++#else ++#include ++#include + #endif + + WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) +diff --git a/streams/wvatomicfile.cc b/streams/wvatomicfile.cc +index 65ae202..db9df88 100644 +--- a/streams/wvatomicfile.cc ++++ b/streams/wvatomicfile.cc +@@ -13,6 +13,8 @@ + + #ifdef MACOS + #include ++#else ++#include + #endif + + WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) diff --git a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb new file mode 100644 index 0000000..01afd5d --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb @@ -0,0 +1,39 @@ +HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" + +DESCRIPTION = "WvStreams is a network programming library in C++" +DEPENDS = "zlib openssl (>= 0.9.8)" + +SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \ + file://vuplus-wvstreams-build-fix.patch;patch=1;pnum=1 \ + " + +inherit autotools pkgconfig + +LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" +EXTRA_OECONF = " --without-tcl --without-qt --without-pam " + +PARALLEL_MAKE = "" + +do_configure() { + autoreconf + oe_runconf +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +#FILES_${PN} = "/" +FILES__${PN} = "" +FILES__${PN} += "${libdir}/libuniconf.so.*" +FILES__${PN} += "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" +FILES__${PN} += "${libdir}/libwvutils.so.*" +FILES__${PN} += "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" + + +SRC_URI[md5sum] = "4ee8ccfe6dfc29bf952d58fa23626c97" +SRC_URI[sha256sum] = "171df8e545b53edb3efbd65b9bc2b35549d05249bd0c92776701f9d8da77ed6f" + diff --git a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb.bak b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb.bak new file mode 100644 index 0000000..0af0dc3 --- /dev/null +++ b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb.bak @@ -0,0 +1,51 @@ +HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" + +DESCRIPTION = "WvStreams is a network programming library in C++" +DEPENDS = "zlib openssl (>= 0.9.8)" + +SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \ + file://vuplus-wvstreams-build-fix.patch;patch=1;pnum=1 \ + " + +inherit autotools pkgconfig + +LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" +#CFLAGS_append += " -DMACOS " +#CXXFLAGS_append += " -DMACOS " + +EXTRA_OECONF = " --without-tcl --without-qt --without-pam " + +PACKAGES_prepend = "libuniconf libuniconf-dbg " +PACKAGES_prepend = "uniconfd uniconfd-dbg " +PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg " +PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg " + +FILES_libuniconf = "${libdir}/libuniconf.so.*" +FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*" + +FILES_uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" +FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd" + +FILES_libwvstreams-base = "${libdir}/libwvutils.so.*" +FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*" + +FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" +FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*" + +PARALLEL_MAKE = "" + +do_configure() { + autoreconf + oe_runconf +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +SRC_URI[md5sum] = "4ee8ccfe6dfc29bf952d58fa23626c97" +SRC_URI[sha256sum] = "171df8e545b53edb3efbd65b9bc2b35549d05249bd0c92776701f9d8da77ed6f" + diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend index 94b8221..4ba07bc 100644 --- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend @@ -1,5 +1,5 @@ -DEPENDS += "libmms" -PR .= "-vuplus0" +DEPENDS += "libmms librtmp" +PR .= "-vuplus1" SRC_URI += " \ file://0001-mpegtsdemux-fix-bd-streamtype-detection.diff.patch \ diff --git a/meta-openvuplus/recipes-multimedia/rtmp/librtmp.bb b/meta-openvuplus/recipes-multimedia/rtmp/librtmp.bb new file mode 100644 index 0000000..2b25149 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/rtmp/librtmp.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "librtmp Real-Time Messaging Protocol API" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e344c8fa836c3a41c4cbd79d7bd3a379" + +DEPENDS = "openssl" + +inherit gitpkgv + +PKGV = "2.4+git${GITPKGV}" +PV = "2.4+git${SRCPV}" +PR = "r2" + +BRANCH="" +SRCREV="7340f6dbc6b3c8e552baab2e5a891c2de75cddcc" + +SRC_URI = "git://git.ffmpeg.org/rtmpdump;protocol=git;branch=${BRANCH};tag=${SRCREV}" + +S = "${WORKDIR}/git/librtmp" + +do_compile() { + oe_runmake CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="${CFLAGS} -fPIC" LDFLAGS="${LDFLAGS}" +} + +do_install() { + install -d ${D}/usr/lib + oe_runmake DESTDIR=${D} install +} diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index cd8c8fa..8fadfd6 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -9,8 +9,6 @@ DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \ 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 \ @@ -49,7 +47,7 @@ SUMMARY_enigma2-plugin-systemplugins-satelliteequipmentcontrol = "allows you to SUMMARY_enigma2-plugin-systemplugins-satfinder = "helps you to align your dish." SUMMARY_enigma2-plugin-systemplugins-skinselector = "shows a menu with selectable skins." SUMMARY_enigma2-plugin-systemplugins-videomode = "selects advanced video modes" -RDEPENDS_enigma2-plugin-extensions-dvdplayer = "libdreamdvd0" +DEPENDS_enigma2-plugin-extensions-dvdplayer = "libdreamdvd0" RDEPENDS_enigma2-plugin-systemplugins-nfiflash = "python-twisted-web" RDEPENDS_enigma2-plugin-systemplugins-softwaremanager = "python-twisted-web" RCONFLICTS_enigma2-plugin-systemplugins-softwaremanager = "enigma2-plugin-systemplugins-configurationbackup enigma2-plugin-systemplugins-softwareupdate" @@ -67,15 +65,24 @@ SUMMARY_enigma2-plugin-systemplugins-networkwizard = "provides easy step by step RDEPENDS_enigma2-plugin-extensions-webbrowser = "python-gdata libqtwebkite4 vuplus-webbrowser-utils qt4-embedded-fonts qt4-embedded-plugin-imageformat-gif qt4-embedded-plugin-imageformat-ico qt4-embedded-plugin-imageformat-jpeg qt4-embedded-plugin-imageformat-mng qt4-embedded-plugin-imageformat-svg qt4-embedded-plugin-imageformat-tiff qt4-embedded-plugin-iconengine-svgicon " SUMMARY_enigma2-plugin-systemplugins-crashreport = "automatically send crashlogs to Vu+" RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-twisted-names python-compression python-mime python-email" -RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usbmodeswitch usbmodeswitch-data wvdial wvstreams libwvutils4.6 libwvstreams-extras libuniconf4.6" RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils" + RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugins-bad-rtmp " -RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount fuse-utils libfuse2 libupnp3 kernel-module-fuse " -RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna libexif12 libavformat52 libavutil50 libavcodec52 libgsm1 libmp3lame0 libschroedinger-1.0-0 libtheora0 liboil" + +DEPENDS += "djmount minidlna" +RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna " +RDEPENDS_enigma2-plugin-extensions-dlnabrowser = "djmount kernel-module-fuse fuse-utils" + +DEPENDS += "opera-hbbtv" +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 = "r42" +PR = "r43" SRCDATE = "20121128" #SRCDATE is NOT used by git to checkout a specific revision diff --git a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb new file mode 100644 index 0000000..7feb064 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "opera-hbbtv" +PRIORITY = "required" +LICENSE = "CLOSED" + +SRC_DATE = "20121128_1" + +PR = "r0_${SRC_DATE}" +SRC_URI = "http://code.vuplus.com/download/build.fc3abf29fb03f797e78f907928125638/embedded/opera-sdk-build-package/opera-hbbtv_${SRC_DATE}.tar.gz" + +INHIBIT_PACKAGE_STRIP = "1" +S = "${WORKDIR}/opera-hbbtv" +do_compile() { +} +do_install() { + install -d ${D}/usr/local/hbb-browser + mv ${S}/opera/* ${D}/usr/local/hbb-browser/ + install -d ${D}/etc + mv ${S}/dfb/etc/* ${D}/etc/ + install -d ${D}/usr/bin + mv ${S}/dfb/usr/bin/* ${D}/usr/bin/ + install -d ${D}/usr/lib + mv ${S}/dfb/usr/lib/* ${D}/usr/lib/ + install -d ${D}/usr/share + mv ${S}/dfb/usr/share/* ${D}/usr/share/ + install -d ${D}/usr/lib/enigma2/python/Plugins/Extensions/HbbTV + mv ${S}/plugin/* ${D}/usr/lib/enigma2/python/Plugins/Extensions/HbbTV +} + +PACKAGES = "${PN}" + +FILES_${PN} = "/" + +SRC_URI[md5sum] = "e534839ac1aedaf2bcdf0e5c277e631c" +SRC_URI[sha256sum] = "9738b06ed35632a675de0cf95bd123d7f9759927a96910c28294ee723fead181" diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb index 58ceee2..0312271 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.3" RDEPENDS_${PN} = " \ enigma2-streamproxy-xinetd \ diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc index bd40509..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 = "r2" +INC_PR = "r3" inherit task @@ -23,15 +23,11 @@ RDEPENDS_${PN} += " \ enigma2-plugin-extensions-remotestreamconvert \ enigma2-plugin-systemplugins-zappingmodeselection \ enigma2-plugin-extensions-addstreamurl \ + enigma2-plugin-extensions-remotestreamconvert \ + vuplus-blindscan-utils \ enigma2-plugin-systemplugins-devicemanager \ " -# vuplus-blindscan-utils \ -# enigma2-plugin-systemplugins-3gmodemmanager \ -# enigma2-plugin-extensions-streamtv \ -# enigma2-plugin-extensions-dlnaserver \ -# enigma2-plugin-extensions-dlnabrowser \ - RDEPENDS_${PN} += " \ aio-grab \ python-crypt \ @@ -56,7 +52,10 @@ RDEPENDS_${PN} += " \ ${@base_contains("VUPLUS_FEATURES", "blindscan", "enigma2-plugin-systemplugins-blindscan", "", d)} \ ${@base_contains("VUPLUS_FEATURES", "fpgaupgrade", "enigma2-plugin-systemplugins-fpgaupgrade", "", d)} \ ${@base_contains("VUPLUS_FEATURES", "firmwareupgrade", "enigma2-plugin-systemplugins-firmwareupgrade", "", d)} \ - ${@base_contains("VUPLUS_FEATURES", "hbbtv", "enigma2-plugin-systemplugins-hbbtv", "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "hbbtv", "enigma2-plugin-extensions-hbbtv", "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "streamtv", "enigma2-plugin-extensions-streamtv", "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "dlna", "enigma2-plugin-extensions-dlnaserver enigma2-plugin-extensions-dlnabrowser", "", d)} \ + ${@base_contains("VUPLUS_FEATURES", "3gmodem", "enigma2-plugin-systemplugins-3gmodemmanager", "", d)} \ " PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/sources b/sources index 1701ba0..4617085 120000 --- a/sources +++ b/sources @@ -1 +1 @@ -/home/code117/work/openvuplus-2.0/sources/ \ No newline at end of file +/opt/hdd2/projects/openpli-oe-core/sources/ \ No newline at end of file