From 51410134bb45446fc6d83a7cffb41a7674433121 Mon Sep 17 00:00:00 2001 From: hschang Date: Wed, 2 Jul 2014 15:24:04 +0900 Subject: [PATCH] [dvbapp] build fix & remove libungif --- meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb | 89 ++++++++++------------ .../enigma2/enigma2/enigma2_vuplus_epng.patch | 50 ++++++++++++ .../libungif/libungif-native_4.1.3.bb | 7 -- .../recipes-vuplus/libungif/libungif_4.1.3.bb | 15 ---- 4 files changed, 92 insertions(+), 69 deletions(-) create mode 100644 meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_epng.patch delete mode 100644 meta-openvuplus/recipes-vuplus/libungif/libungif-native_4.1.3.bb delete mode 100644 meta-openvuplus/recipes-vuplus/libungif/libungif_4.1.3.bb diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 66b8378..bf991b8 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -1,28 +1,23 @@ DESCRIPTION = "Enigma2 is an experimental, but useful framebuffer-based frontend for DVB functions" -MAINTAINER = "Felix Domke " +MAINTAINER = "vuplus team" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e255efa454e0155c1fd758df7dcaf3" -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 ntfs-3g dosfstools util-linux \ -" -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 \ - gst-plugins-good-wavparse gst-plugins-ugly-mpegstream \ - gst-plugins-good-flac gst-plugin-dvbmediasink gst-plugins-bad-mpegdemux gst-plugins-ugly-dvdsub \ - gst-plugins-good-souphttpsrc gst-plugins-ugly-mpegaudioparse gst-plugins-base-subparse \ - gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \ - gst-plugins-bad-mms gst-plugins-ugly-asf gst-plugins-bad-faad \ +DEPENDS = "jpeg giflib 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 ntfs-3g dosfstools util-linux \ " -RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \ - python-xml python-fcntl python-stringold python-pickle python-netclient \ - glibc-gconv-iso8859-15 ethtool parted \ - ${RDEPENDS_GST} \ +GST_RDEPENDS = "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 \ + gst-plugins-good-wavparse gst-plugins-ugly-mpegstream \ + gst-plugins-good-flac gst-plugin-dvbmediasink gst-plugins-bad-mpegdemux gst-plugins-ugly-dvdsub \ + gst-plugins-good-souphttpsrc gst-plugins-ugly-mpegaudioparse gst-plugins-base-subparse \ + gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \ + gst-plugins-bad-mms gst-plugins-ugly-asf gst-plugins-good-avi gst-plugins-bad-faad \ " GST_RTSP_RDEPENDS = "gst-plugins-good-udp gst-plugins-good-rtsp gst-plugins-good-rtp gst-plugins-good-rtpmanager" @@ -31,7 +26,11 @@ GST_MISC_RDEPENDS = "gst-plugins-good-matroska gst-plugins-good-isomp4 gst-plugi GST_DVD_RDEPENDS = "gst-plugins-bad-cdxaparse gst-plugins-ugly-cdio gst-plugins-bad-vcdsrc" GST_BASE_RDEPENDS = "${GST_ALSA_RDEPENDS} ${GST_MISC_RDEPENDS} ${GST_RTSP_RDEPENDS}" -RDEPENDS_append_vuplus = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugins-good-avi" +RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \ + python-xml python-fcntl python-stringold python-pickle python-netclient \ + glibc-gconv-iso8859-15 ethtool parted \ + ${GST_RDEPENDS} ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} \ +" # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both # enigma2 and enigma2-plugins produce enigma2-plugin-*. @@ -91,37 +90,36 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extension PN = "enigma2" PR = "r72" -SRCDATE = "20121128" -#SRCDATE is NOT used by git to checkout a specific revision -#but we need it to build a ipk package version -#when you like to checkout a specific revision of e2 you need -#have to specify a commit id or a tag name in SRCREV +inherit gitpkgv pythonnative + +PKGV = "git${GITPKGV}" #################################################### BRANCH = "vuplus_experimental" -PV = "experimental-git${SRCDATE}" +PV = "experimental-git${SRCPV}" SRCREV = "" #################################################### # enigma2_vuplus_mediaplayer.patch is for trick-play in media player SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \ - file://enigma2_vuplus_skin.patch;patch=1;pnum=1 \ - file://enigma2_vuplus_mediaplayer.patch;patch=1;pnum=1 \ - file://enigma2_vuplus_mediaplayer_subtitle.patch;patch=1;pnum=1 \ - file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \ - file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \ - file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \ - file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \ - file://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \ - file://enigma2_vuplus_fix_standby_name.patch \ - file://enigma2_vuplus_fix_standby_name_skin.patch \ - file://MyriadPro-Regular.otf \ - file://MyriadPro-Semibold.otf \ - file://MyriadPro-SemiboldIt.otf \ - file://750S \ - file://Vu_HD \ - file://number_key \ + file://enigma2_vuplus_skin.patch \ + file://enigma2_vuplus_mediaplayer.patch \ + file://enigma2_vuplus_mediaplayer_subtitle.patch \ + file://enigma2_vuplus_remove_dreambox_enigma.patch \ + file://enigma2_vuplus_vfd_mode.patch \ + file://enigma2_vuplus_addlibpythondeps.patch \ + file://enigma2_vuplus_pluginbrowser.patch \ + file://enigma2_vuplus_proc_oom_score_adj.patch \ + file://enigma2_vuplus_fix_standby_name.patch \ + file://enigma2_vuplus_fix_standby_name_skin.patch \ + file://enigma2_vuplus_epng.patch \ + file://MyriadPro-Regular.otf \ + file://MyriadPro-Semibold.otf \ + file://MyriadPro-SemiboldIt.otf \ + file://750S \ + file://Vu_HD \ + file://number_key \ " SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}" @@ -149,7 +147,7 @@ def changeword(file): os.system(cmd1) do_unpack_append(){ - change_po() + change_po() } S = "${WORKDIR}/git" @@ -159,7 +157,7 @@ FILES_${PN}-meta = "${datadir}/meta" PACKAGES += "${PN}-meta" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools pkgconfig +inherit autotools pkgconfig pythonnative do_configure_prepend() { git checkout ${BRANCH} @@ -202,6 +200,3 @@ python populate_packages_prepend() { do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True) } -RCONFLICTS_${PN} = "dreambox-keymaps" -RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)" - diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_epng.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_epng.patch new file mode 100644 index 0000000..037a814 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_epng.patch @@ -0,0 +1,50 @@ +diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp +index d8c1982..2ba5a12 100644 +--- a/lib/gdi/epng.cpp ++++ b/lib/gdi/epng.cpp +@@ -1,4 +1,5 @@ + #define PNG_SKIP_SETJMP_CHECK ++#include + #include + #include + #include +@@ -52,7 +53,7 @@ int loadPNG(ePtr &result, const char *filename) + fclose(fp); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if ( setjmp(png_jmpbuf(png_ptr)) ) + { + eDebug("das war wohl nix"); + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); +@@ -145,7 +146,7 @@ int loadPNG(ePtr &result, const char *filename) + for (pass = 0; pass < number_passes; pass++) + for (int y = 0; y < height; y++) + { +- png_read_rows(png_ptr, &rowptr[y], png_bytepp_NULL, 1); ++ png_read_rows(png_ptr, &rowptr[y], NULL, 1); + } + + /* +@@ -323,7 +324,7 @@ int savePNG(const char *filename, gPixmap *pixmap) + PNG_COLOR_TYPE_RGB_ALPHA, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + +- if (setjmp(png_ptr->jmpbuf)) ++ if ( setjmp(png_jmpbuf(png_ptr)) ) + { + eDebug("error :/"); + png_destroy_write_struct(&png_ptr, &info_ptr); +diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp +index 2afebd5..ab7a0b5 100644 +--- a/lib/gdi/picload.cpp ++++ b/lib/gdi/picload.cpp +@@ -280,7 +280,7 @@ static unsigned char *png_load(const char *file, int *ox, int *oy, int *_bypp) + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + fclose(fh); diff --git a/meta-openvuplus/recipes-vuplus/libungif/libungif-native_4.1.3.bb b/meta-openvuplus/recipes-vuplus/libungif/libungif-native_4.1.3.bb deleted file mode 100644 index c8cc832..0000000 --- a/meta-openvuplus/recipes-vuplus/libungif/libungif-native_4.1.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libungif_${PV}.bb - -S = "${WORKDIR}/libungif-${PV}" - -PACKAGES = "" - -inherit autotools native diff --git a/meta-openvuplus/recipes-vuplus/libungif/libungif_4.1.3.bb b/meta-openvuplus/recipes-vuplus/libungif/libungif_4.1.3.bb deleted file mode 100644 index d14c643..0000000 --- a/meta-openvuplus/recipes-vuplus/libungif/libungif_4.1.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "shared library for GIF images" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2" -SRC_URI[md5sum] = "8c198831cc0495596c78134b8849e9ad" -SRC_URI[sha256sum] = "59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36" - -inherit autotools lib_package - -PACKAGES =+ "${PN}-utils" - -FILES_${PN}-utils = "${bindir}/*" -- 2.7.4