Skip to content

Commit

Permalink
update libupnp, update djmount.
Browse files Browse the repository at this point in the history
Originally offered as PR by @kueken in #877
  • Loading branch information
WanWizard committed Nov 25, 2020
1 parent a4ce57f commit 2ab0c88
Show file tree
Hide file tree
Showing 12 changed files with 80 additions and 90 deletions.
2 changes: 2 additions & 0 deletions meta-openpli/conf/distro/reporefs.conf
Expand Up @@ -173,6 +173,7 @@ SRCREV_pn-libdvdread ??= "${AUTOREV}"
SRCREV_pn-libsquish ??= "${AUTOREV}"
SRCREV_pn-libtuxtxt ??= "${AUTOREV}"
SRCREV_pn-libudfread ??= "${AUTOREV}"
SRCREV_pn-libupnp ??= "a6c3616530490ca67db41131572ec18f00d95eb0"

SRCREV_pn-enigma2-plugin-extensions-openmultiboot ??= "${AUTOREV}"
SRCREV_pn-ofgwrite ??= "${AUTOREV}"
Expand Down Expand Up @@ -310,6 +311,7 @@ SRCREV_pn-lsdir ??= "${AUTOREV}"
SRCREV_pn-f4mdump ??= "${AUTOREV}"
SRCREV_pn-hlsdl ??= "${AUTOREV}"
SRCREV_pn-rclone ??= "c2635e39cc462210500bbcbab43147096c8cdd35"
SRCREV_pn-djmount ??= "02d7d47c4f04054a8a1c174b75839ee38682af86"

# sdgradio
SRCREV_pn-dab-cmdline-sdgradio ??= "${AUTOREV}"
Expand Down
26 changes: 12 additions & 14 deletions meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb
Expand Up @@ -2,35 +2,33 @@ DESCRIPTION = "mount UPnP server content as a linux filesystem"
HOMEPAGE = "http://djmount.sourceforge.net/"
LICENSE = "GPLv2+"
DEPENDS = "libupnp fuse"
RDEPENDS_${PN} = "fuse"
PR = "r5"
RDEPENDS_${PN} = "libupnp fuse"

LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"

INITSCRIPT_NAME = "djmount"
INITSCRIPT_PARAMS = "defaults"

inherit autotools update-rc.d pkgconfig gettext
CFLAGS_append+= "-std=gnu89"

EXTRA_OECONF = "--with-external-libupnp --with-fuse-prefix='${STAGING_LIBDIR}'"
SRC_URI = "git://github.com/mbarbon/djmount.git;protocol=http;branch=fixes"

SRC_URI = "${SOURCEFORGE_MIRROR}/djmount/djmount-0.71.tar.gz \
SRC_URI_append +=" \
file://init \
file://configure.ac.patch \
file://rt_bool_arg_enable.m4.patch \
file://001-libupnp-1.6.6.diff \
file://002-libupnp-1.6.13.diff \
file://003-support-fstab-mounting.diff \
file://004-avoid-crash-by-using-size_t.diff \
file://04-support-fstab-mounting.patch \
file://missing_header.patch \
"

SRC_URI[md5sum] = "c922753e706c194bf82a8b6ca77e6a9a"
SRC_URI[sha256sum] = "aa5bb482af4cbd42695a7e396043d47b53d075ac2f6aa18a8f8e11383c030e4f"
EXTRA_OECONF = "--with-external-libupnp-prefix='${STAGING_LIBDIR}' --with-fuse-prefix='${STAGING_LIBDIR}'"

do_configure_prepend() {
mkdir ${S}/libupnp/config.aux/
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/libupnp/config.aux/config.rpath
}

S = "${WORKDIR}/git"

inherit autotools update-rc.d pkgconfig gettext

do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/djmount
Expand Down

This file was deleted.

This file was deleted.

@@ -0,0 +1,21 @@
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR(m4)

AC_CONFIG_SRCDIR(djmount/djfs.c)

-AM_INIT_AUTOMAKE([1.9 -Wall std-options gnu])
+AM_INIT_AUTOMAKE([1.9 -Wall subdir-objects std-options gnu foreign])

AC_CONFIG_HEADERS(config.h)

@@ -191,7 +191,8 @@ if test x"$enable_charset" = xyes; then
# Checks for function in C library or libiconv
# (AM macros from "gettext" package)
AM_ICONV
- AM_LANGINFO_CODESET
+# AM_LANGINFO_CODESET
+ AM_GNU_GETTEXT([external])
# TBD print warning if no setlocale or nl_langinfo(CODESET) implemented
fi
AM_CONDITIONAL(WANT_ICONV,
11 changes: 0 additions & 11 deletions meta-openpli/recipes-connectivity/djmount/files/configure.ac.patch

This file was deleted.

@@ -0,0 +1,21 @@
--- a/djmount/upnp_util.h
+++ b/djmount/upnp_util.h
@@ -28,6 +28,7 @@


#include <upnp.h>
+#include <upnpconfig.h>
#include <upnptools.h>


--- a/djmount/xml_util.h
+++ b/djmount/xml_util.h_neu
@@ -25,6 +25,7 @@
#define XML_UTIL_H_INCLUDED

#include <config.h>
+#include <upnpconfig.h>

#include <stdbool.h>
#include <inttypes.h>

This file was deleted.

24 changes: 24 additions & 0 deletions meta-openpli/recipes-connectivity/libupnp/libupnp_git.bb
@@ -0,0 +1,24 @@
SUMMARY = "Portable SDK for UPnP* Devices"
DESCRIPTION = "The Portable SDK for UPnP Devices is an SDK for development of \
UPnP device and control point applications. It consists of the core UPnP \
protocols along with a UPnP-specific eXtensible Markup Language (XML) parser \
supporting the Document Object Model (DOM) Level 2 API and an optional, \
integrated mini web server for serving UPnP related documents."
HOMEPAGE = "http://pupnp.sourceforge.net/"
LICENSE = "BSD-3-Clause"

LIC_FILES_CHKSUM = "file://COPYING;md5=394a0f17b97f33426275571e15920434"

PV = "1.14.0+git${SRCPV}"

SRC_URI = "git://github.com/mrjimenez/pupnp.git;protocol=https"

S="${WORKDIR}/git"

inherit autotools pkgconfig

EXTRA_OECONF += "--enable-reuseaddr"

# Enable LFS support ( for samples )
CFLAGS += "-std=gnu89 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

This file was deleted.

0 comments on commit 2ab0c88

Please sign in to comment.