From 355c38f576b9396cf4dfccd3032eb69fd8551828 Mon Sep 17 00:00:00 2001 From: Shibby Date: Sat, 11 Jan 2014 13:30:12 +0100 Subject: [PATCH] Makefile and libfoo.pl for new packages --- release/src/btools/libfoo.pl | 32 ++++++++++---- release/src/router/Makefile | 93 ++++++++++++++++++++++++++++++---------- release/src/router/rc/services.c | 2 + 3 files changed, 96 insertions(+), 31 deletions(-) diff --git a/release/src/btools/libfoo.pl b/release/src/btools/libfoo.pl index 8efefaa670..bb15774476 100755 --- a/release/src/btools/libfoo.pl +++ b/release/src/btools/libfoo.pl @@ -158,15 +158,29 @@ sub fixDyn #shibby fixDynDep("transmission-daemon", "libevent-2.0.so.5"); - fixDynDep("transmission-daemon", "libcurl.so.4.2.0"); -# fixDynDep("transmission-daemon", "libiconv.so.2"); + fixDynDep("transmission-daemon", "libcurl.so.4.3.0"); +# fixDynDep("transmission-daemon", "libiconv.so.2.4.0"); fixDynDep("transmission-remote", "libevent-2.0.so.5"); - fixDynDep("transmission-remote", "libcurl.so.4.2.0"); -# fixDynDep("transmission-remote", "libiconv.so.2"); + fixDynDep("transmission-remote", "libcurl.so.4.3.0"); +# fixDynDep("transmission-remote", "libiconv.so.2.4.0"); fixDynDep("radvd", "libdaemon.so.0.5.0"); fixDynDep("miniupnpd", "libnfnetlink.so.0.2.0"); fixDynDep("dnscrypt-proxy", "libsodium.so.4.5.0"); +#minidlna module, bwq518 + fixDynDep("minidlna", "libz.so.1"); + fixDynDep("minidlna", "libstdc.so.6"); + fixDynDep("minidlna", "libiconv.so.2.4.0"); + fixDynDep("minidlna", "libssl.so.1.0.0"); + fixDynDep("minidlna", "libjpeg.so"); + fixDynDep("minidlna", "libogg.so.0"); + fixDynDep("minidlna", "libvorbis.so.0"); + fixDynDep("minidlna", "libid3tag.so.0"); + fixDynDep("minidlna", "libexif.so.12"); + fixDynDep("minidlna", "libFLAC.so.8"); + fixDynDep("libjepg.so", "libc.so.0"); + fixDynDep("libavcodec.so.52", "libpthread.so.0"); + #ipset modules fixDynDep("libipset_iphash.so", "ipset"); fixDynDep("libipset_iptree.so", "ipset"); @@ -477,9 +491,9 @@ genSO("${root}/usr/lib/libvorbis.so.0", "${router}/libvorbis/lib/.libs/libvorbis genSO("${root}/usr/lib/libid3tag.so.0", "${router}/libid3tag/.libs/libid3tag.a", "", "-L${router}/zlib"); genSO("${root}/usr/lib/libexif.so.12", "${router}/libexif/libexif/.libs/libexif.a"); genSO("${root}/usr/lib/libFLAC.so.8", "${router}/flac/src/libFLAC/.libs/libFLAC.a", "", "-L${router}/libogg/src/.libs"); -genSO("${root}/usr/lib/libavcodec.so.52", "${router}/ffmpeg/libavcodec/libavcodec.a", "", "-L${router}/ffmpeg/libavutil"); -genSO("${root}/usr/lib/libavutil.so.50", "${router}/ffmpeg/libavutil/libavutil.a"); -genSO("${root}/usr/lib/libavformat.so.52", "${router}/ffmpeg/libavformat/libavformat.a", "", "-L${router}/ffmpeg/libavutil -L${router}/ffmpeg/libavcodec"); +genSO("${root}/usr/lib/libavcodec.so.52", "${router}/ffmpeg/libavcodec/libavcodec.a", "", "-L${router}/ffmpeg/libavutil -L${router}/zlib"); +genSO("${root}/usr/lib/libavutil.so.50", "${router}/ffmpeg/libavutil/libavutil.a", "-L${router}/zlib"); +genSO("${root}/usr/lib/libavformat.so.52", "${router}/ffmpeg/libavformat/libavformat.a", "", "-L${router}/ffmpeg/libavutil -L${router}/ffmpeg/libavcodec -L${router}/zlib"); genSO("${root}/usr/lib/libsmb.so", "${router}/samba/source/bin/libsmb.a"); genSO("${root}/usr/lib/libbigballofmud.so", "${router}/samba3/source/bin/libbigballofmud.a"); @@ -494,10 +508,10 @@ genSO("${root}/usr/lib/liblzo2.so.2", "${router}/lzo/src/.libs/liblzo2.a"); genSO("${root}/usr/lib/libbcmcrypto.so", "${router}/libbcmcrypto/libbcmcrypto.a"); #shibby -genSO("${root}/usr/lib/libcurl.so.4.2.0", "${router}/libcurl/lib/.libs/libcurl.a", "", "-L${router}/zlib"); +genSO("${root}/usr/lib/libcurl.so.4.3.0", "${router}/libcurl/lib/.libs/libcurl.a", "", "-L${router}/zlib"); genSO("${root}/usr/lib/libevent-2.0.so.5", "${router}/libevent/.libs/libevent.a"); genSO("${root}/usr/lib/libdaemon.so.0.5.0", "${router}/libdaemon/libdaemon/.libs/libdaemon.a"); -#genSO("${root}/usr/lib/libiconv.so.2", "${router}/libiconv/lib/.libs/libiconv.a"); +genSO("${root}/usr/lib/libiconv.so.2.4.0", "${router}/libiconv/lib/.libs/libiconv.a"); genSO("${root}/usr/lib/libnfnetlink.so.0.2.0", "${router}/libnfnetlink/src/.libs/libnfnetlink.a"); genSO("${root}/usr/lib/libsodium.so.4.5.0", "${router}/libsodium/src/libsodium/.libs/libsodium.a"); diff --git a/release/src/router/Makefile b/release/src/router/Makefile index 2645f478bc..7e9450f5f9 100644 --- a/release/src/router/Makefile +++ b/release/src/router/Makefile @@ -139,6 +139,7 @@ obj-$(TCONFIG_IPV6) += dhcpv6 obj-$(TCONFIG_MEDIA_SERVER) += zlib obj-$(TCONFIG_MEDIA_SERVER) += sqlite obj-$(TCONFIG_MEDIA_SERVER) += ffmpeg +obj-$(TCONFIG_MEDIA_SERVER) += libiconv obj-$(TCONFIG_MEDIA_SERVER) += libogg obj-$(TCONFIG_MEDIA_SERVER) += flac obj-$(TCONFIG_MEDIA_SERVER) += jpeg @@ -146,7 +147,8 @@ obj-$(TCONFIG_MEDIA_SERVER) += libexif obj-$(TCONFIG_MEDIA_SERVER) += libid3tag obj-$(TCONFIG_MEDIA_SERVER) += libvorbis obj-$(TCONFIG_MEDIA_SERVER) += minidlna -MEDIA_SERVER_STATIC=y +#MEDIA_SERVER_STATIC=y +MEDIA_SERVER_STATIC := obj-y += libnfnetlink obj-y += miniupnpd @@ -1234,6 +1236,8 @@ sqlite-install: sqlite ifneq ($(MEDIA_SERVER_STATIC),y) install -D sqlite/.libs/libsqlite3.so.0 $(INSTALLDIR)/sqlite/usr/lib/libsqlite3.so.0 $(STRIP) $(INSTALLDIR)/sqlite/usr/lib/libsqlite3.so.0 + cd $(INSTALLDIR)/sqlite/usr/lib/ && \ + ln -sf libsqlite3.so.0 libsqlite3.so endif FFMPEG_FILTER_CONFIG= $(foreach c, $(2), --$(1)="$(c)") @@ -1448,10 +1452,47 @@ ifneq ($(MEDIA_SERVER_STATIC),y) $(STRIP) $(INSTALLDIR)/libvorbis/usr/lib/libvorbis.so.0 endif -minidlna: zlib sqlite ffmpeg libogg flac jpeg libexif libid3tag libvorbis +minidlna/stamp-h1: zlib sqlite ffmpeg libogg flac jpeg libexif libid3tag libvorbis libiconv + cd minidlna && CC=$(CC) CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) STRIP='mipsel-uclibc-strip' HOST=mipsel-linux \ + CFLAGS="-Wall -Os -D_GNU_SOURCE $(EXTRACFLAGS) -D_FILE_OFFSET_BITS=64 \ + -ffunction-sections -fdata-sections \ + -I$(TOP)/ffmpeg/libavutil -I$(TOP)/ffmpeg/libavcodec -I$(TOP)/ffmpeg/libavformat \ + -I$(TOP)/ffmpeg/libswscale -I$(TOP)/ffmpeg \ + -I$(TOP)/flac/include -I$(TOP)/sqlite -I$(TOP)/jpeg \ + -I$(TOP)/libexif -I$(TOP)/libid3tag -I$(TOP)/libogg/include \ + -I$(TOP)/libvorbis/include \ + -I$(TOP)/libiconv/include \ + -I$(TOP)/sqlite" \ + LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC \ + -L$(TOP)/zlib -L$(TOP)/sqlite/.libs -L$(TOP)/jpeg -L$(TOP)/libvorbis/lib/.libs \ + -L$(TOP)/libogg/src/.libs -L$(TOP)/libexif/libexif/.libs -L$(TOP)/flac/src/libFLAC/.libs \ + -L$(TOP)/ffmpeg/libavutil -L$(TOP)/ffmpeg/libavcodec -L$(TOP)/ffmpeg/libavformat \ + -L$(TOP)/libid3tag/.libs -L$(TOP)/libiconv/lib/.libs" \ + CPPFLAGS="-Wall -Os -D_GNU_SOURCE $(EXTRACFLAGS) -D_FILE_OFFSET_BITS=64 \ + -ffunction-sections -fdata-sections \ + -I$(TOP)/ffmpeg/libavutil -I$(TOP)/ffmpeg/libavcodec -I$(TOP)/ffmpeg/libavformat \ + -I$(TOP)/ffmpeg/libswscale -I$(TOP)/ffmpeg \ + -I$(TOP)/flac/include -I$(TOP)/sqlite -I$(TOP)/jpeg \ + -I$(TOP)/libexif -I$(TOP)/libid3tag -I$(TOP)/libogg/include \ + -I$(TOP)/libvorbis/include \ + -I$(TOP)/libiconv/include \ + -I$(TOP)/sqlite" \ + LIBS="-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -lm -ldl -lz" \ + $(CONFIGURE) --host=mipsel-linux --build=x86_64-linux-gnu + touch minidlna/stamp-h1 + +minidlna: minidlna/stamp-h1 @$(SEP) - @$(MAKE) -C minidlna CC=$(CC) $(if $(MEDIA_SERVER_STATIC),STATIC=1,) minidlna $(PARALLEL_BUILD) + @$(MAKE) -C minidlna all $(PARALLEL_BUILD) +minidlna-clean: + -@$(MAKE) -C minidlna clean + @rm -f minidlna/stamp-h1 + +minidlna-install: minidlan + @$(SEP) + install -D minidlna/minidlnad $(INSTALLDIR)/minidlna/usr/sbin/minidlna + $(STRIP) $(INSTALLDIR)/minidlna/usr/sbin/minidlna igmpproxy/src/Makefile: igmpproxy/src/Makefile.in cd igmpproxy && CFLAGS="-O2 -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \ @@ -1629,8 +1670,7 @@ openvpn_plugin_auth_nvram:nvram #shibby libcurl/stamp-h1: zlib openssl cd libcurl && CC=$(CC) STRIP='mipsel-uclibc-strip' \ - CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \ - CPPFLAGS="-I$(TOP)/zlib" \ + CPPFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections -I$(TOP)/zlib" \ LDFLAGS="-L$(TOP)/zlib -ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC" \ $(CONFIGURE) --prefix=/usr --disable-thread --enable-shared --enable-static \ --enable-ares --enable-cookies --enable-crypto-auth --enable-nonblocking \ @@ -1653,11 +1693,11 @@ libcurl-clean: libcurl-install: libcurl install -d $(INSTALLDIR)/libcurl/usr/lib - install -D libcurl/lib/.libs/libcurl.so.4.2.0 $(INSTALLDIR)/libcurl/usr/lib/libcurl.so.4.2.0 - $(STRIP) -s $(INSTALLDIR)/libcurl/usr/lib/libcurl.so.4.2.0 + install -D libcurl/lib/.libs/libcurl.so.4.3.0 $(INSTALLDIR)/libcurl/usr/lib/libcurl.so.4.3.0 + $(STRIP) -s $(INSTALLDIR)/libcurl/usr/lib/libcurl.so.4.3.0 cd $(INSTALLDIR)/libcurl/usr/lib/ && \ - ln -sf libcurl.so.4.2.0 libcurl.so.4 && \ - ln -sf libcurl.so.4.2.0 libcurl.so + ln -sf libcurl.so.4.3.0 libcurl.so.4 && \ + ln -sf libcurl.so.4.3.0 libcurl.so libevent/stamp-h1: cd libevent && CC=$(CC) \ @@ -1685,7 +1725,7 @@ libiconv/stamp-h1: cd libiconv && CC=$(CC) \ CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \ LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC" \ - $(CONFIGURE) --prefix=/usr --disable-nls --enable-static + $(CONFIGURE) --prefix=/usr --disable-nls --enable-static --enable-shared touch libiconv/stamp-h1 libiconv: libiconv/stamp-h1 @@ -1698,25 +1738,34 @@ libiconv-clean: libiconv-install: libiconv install -d $(INSTALLDIR)/libiconv/usr/lib - install libiconv/lib/.libs/libiconv.so.2.4.0 $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2 - $(STRIP)-s $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2 + install libiconv/lib/.libs/libiconv.so.2.4.0 $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2.4.0 + $(STRIP)-s $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2.4.0 + cd $(INSTALLDIR)/libiconv/usr/lib/ && \ + ln -sf libiconv.so.2.4.0 libiconv.so.2 && \ + ln -sf libiconv.so.2.4.0 libiconv.so transmission/stamp-h1: openssl libcurl libevent zlib cd transmission && CC=$(CC) STRIP='mipsel-uclibc-strip' \ CFLAGS="-Os -Wall -fno-delete-null-pointer-checks -funit-at-a-time \ --param large-function-growth=800 --param max-inline-insns-single=3000 \ -ffunction-sections -fdata-sections" \ - LDFLAGS="-L$(TOP)/zlib -ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC" \ - CPPFLAGS="-I$(TOP)/zlib" \ + LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC \ + -L$(TOP)/zlib -L$(TOP)/openssl -L$(TOP)/libcurl/lib/.libs -L$(TOP)/libevent/.libs" \ HAVE_CXX=yes \ - $(CONFIGURE) --target=mipsel-linux --prefix=/usr --disable-nls \ - --enable-lightweight --enable-largefile --enable-utp --without-gtk \ - LIBCURL_CFLAGS="-I$(TOP)/libcurl/include" \ - LIBCURL_LIBS="-L$(TOP)/libcurl/lib/.libs -lcurl" \ - LIBEVENT_CFLAGS="-I$(TOP)/libevent/include" \ - LIBEVENT_LIBS="-L$(TOP)/libevent/.libs -levent" \ - OPENSSL_CFLAGS="-I$(TOP)/openssl/include" \ - OPENSSL_LIBS="-L$(TOP)/openssl -lcrypto -lssl" + $(CONFIGURE) --target=mipsel-linux --host=mipsel-linux --build=x86_64-linux-gnu --prefix=/usr --disable-nls \ + --enable-lightweight --enable-largefile --enable-utp --without-gtk \ + LIBCURL_CFLAGS="-I$(TOP)/libcurl/include" \ + LIBCURL_LDFLAGS="-L$(TOP)/libcurl/lib/.libs/" \ + LIBCURL_LIBS="-lcurl" \ + LIBEVENT_CFLAGS="-I$(TOP)/libevent/include" \ + LIBEVENT_LDFLAGS="-L$(TOP)/libevent/.libs" \ + LIBEVENT_LIBS="-levent" \ + OPENSSL_CFLAGS="-I$(TOP)/openssl/include" \ + OPENSSL_LDFLAGS="-L$(TOP)/openssl" \ + OPENSSL_LIBS="-lcrypto -lssl" \ + ZLIB_CFLAGS="-I$(TOP)/zlib" \ + ZLIB_LDFLAGS="-L$(TOP)/zlib" \ + ZLIB_LIBS="-lz" touch transmission/stamp-h1 transmission: transmission/stamp-h1 diff --git a/release/src/router/rc/services.c b/release/src/router/rc/services.c index 680eebd9d4..d834282c6f 100644 --- a/release/src/router/rc/services.c +++ b/release/src/router/rc/services.c @@ -1979,6 +1979,8 @@ static void start_media_server(void) "inotify=yes\n" "notify_interval=600\n" "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\n" + "log_dir=/var/log\n" + "log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn\n" "\n", nvram_safe_get("lan_ifname"), (port < 0) || (port >= 0xffff) ? 0 : port, -- 2.11.4.GIT