bump version libogg-1.3.3

diff --git a/archive-patches/libogg-1.1.4-nodoc.diff b/archive-patches/libogg-1.1.4-nodoc.diff
deleted file mode 100644 (file)
index 79c8579..0000000
--- a/archive-patches/libogg-1.1.4-nodoc.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,10 +1,10 @@
- ## Process this file with automake to produce Makefile.in
- 
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
- 
--SUBDIRS = src include doc
-+SUBDIRS = src include
- 
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ogg.m4
- 
- pkgconfigdir = $(libdir)/pkgconfig
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -203,11 +203,11 @@ srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
--SUBDIRS = src include doc
-+SUBDIRS = src include
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ogg.m4
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = ogg.pc
- EXTRA_DIST = README AUTHORS CHANGES COPYING \

diff --git a/archive-patches/libogg-1.3.0-nodoc.diff b/archive-patches/libogg-1.3.0-nodoc.diff
deleted file mode 100644 (file)
index 5baf638..0000000
--- a/archive-patches/libogg-1.3.0-nodoc.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,10 +2,10 @@
- 
- 
- #AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
- AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
- 
--SUBDIRS = src include doc
-+SUBDIRS = src include
- 
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ogg.m4
- 
- pkgconfigdir = $(libdir)/pkgconfig
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -257,11 +257,11 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
- #AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
- AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
--SUBDIRS = src include doc
-+SUBDIRS = src include
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ogg.m4
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = ogg.pc
- EXTRA_DIST = README AUTHORS CHANGES COPYING 

diff --git a/archive-patches/libogg-1.3.1-nodoc.diff b/archive-patches/libogg-1.3.1-nodoc.diff
deleted file mode 100644 (file)
index 5baf638..0000000
--- a/archive-patches/libogg-1.3.1-nodoc.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,10 +2,10 @@
- 
- 
- #AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
- AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
- 
--SUBDIRS = src include doc
-+SUBDIRS = src include
- 
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ogg.m4
- 
- pkgconfigdir = $(libdir)/pkgconfig
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -257,11 +257,11 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
- #AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
- AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
--SUBDIRS = src include doc
-+SUBDIRS = src include
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ogg.m4
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = ogg.pc
- EXTRA_DIST = README AUTHORS CHANGES COPYING 

diff --git a/make/archives.mk b/make/archives.mk
index 593081e7abc4697b7ef12843b59cdb2fc2d3b15b..4a733d44c6e6b9a3d7d0e75e2a3ddd2cc62cb64e 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -106,8 +106,8 @@ $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz:
 $(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz:
        $(WGET) https://sourceforge.net/projects/mxedeps/files/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz
 
-$(ARCHIVE)/libogg-1.3.1.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/libogg-1.3.1.tar.gz
+$(ARCHIVE)/libogg-$(LIBOGG_VER).tar.gz:
+       $(WGET) https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-$(LIBOGG_VER).tar.gz
 
 $(ARCHIVE)/libvorbis-1.3.2.tar.bz2:
        $(WGET) http://www.fhloston-paradise.de/libvorbis-1.3.2.tar.bz2

diff --git a/make/libraries.mk b/make/libraries.mk
index 033bd6d64779f554276f8f28aaa18757e71b9229..a952dbd0d07095cce71fb8d27c9967fe335e250d 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -733,17 +733,69 @@ $(D)/libvorbis: $(D)/libogg $(ARCHIVE)/libvorbis-1.3.2.tar.bz2 | $(TARGETPREFIX)
        $(REMOVE)/libvorbis-1.3.2
        $(TOUCH)
 
-$(D)/libogg: $(ARCHIVE)/libogg-1.3.1.tar.gz | $(TARGETPREFIX)
+$(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
-       $(UNTAR)/libogg-1.3.1.tar.gz
-       pushd $(BUILD_TMP)/libogg-1.3.1 && \
-               patch -p1 < $(PATCHES)/libogg-1.3.1-nodoc.diff && \
-               $(CONFIGURE) --prefix= --enable-shared && \
+       $(UNTAR)/libogg-$(LIBOGG_VER).tar.gz
+       pushd $(BUILD_TMP)/libogg-$(LIBOGG_VER) && \
+               $(CONFIGURE) \
+                       --prefix= \
+                       --docdir=/.remove \
+                       --enable-shared \
+                       --disable-static && \
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/ogg.pc
        $(REWRITE_LIBTOOL)/libogg.la
-       $(REMOVE)/libogg-1.3.1
+       $(REMOVE)/libogg-$(LIBOGG_VER)
+       $(TOUCH)
+
+#
+# minidlna
+#
+MINIDLNA_VER = 1.1.5
+MINIDLNA_SOURCE = minidlna-$(MINIDLNA_VER).tar.gz
+MINIDLNA_PATCH = minidlna-$(MINIDLNA_VER).patch
+
+$(ARCHIVE)/$(MINIDLNA_SOURCE):
+       $(WGET) https://sourceforge.net/projects/minidlna/files/minidlna/$(MINIDLNA_VER)/$(MINIDLNA_SOURCE)
+
+$(D)/minidlna: $(D)/bootstrap $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $(D)/libogg $(D)/libvorbis $(D)/flac $(D)/ffmpeg $(ARCHIVE)/$(MINIDLNA_SOURCE)
+       $(START_BUILD)
+       $(REMOVE)/minidlna-$(MINIDLNA_VER)
+       $(UNTAR)/$(MINIDLNA_SOURCE)
+       set -e; cd $(BUILD_TMP)/minidlna-$(MINIDLNA_VER); \
+               $(call apply_patches,$(MINIDLNA_PATCH)); \
+               autoreconf -fi $(SILENT_OPT); \
+               $(CONFIGURE) \
+                       --prefix=/usr \
+               ; \
+               $(MAKE); \
+               $(MAKE) install prefix=/usr DESTDIR=$(TARGET_DIR)
+       $(REMOVE)/minidlna-$(MINIDLNA_VER)
+       $(TOUCH)
+
+#
+# libexif
+#
+LIBEXIF_VER = 0.6.21
+LIBEXIF_SOURCE = libexif-$(LIBEXIF_VER).tar.gz
+
+$(ARCHIVE)/$(LIBEXIF_SOURCE):
+       $(WGET) https://sourceforge.net/projects/libexif/files/libexif/$(LIBEXIF_VER)/$(LIBEXIF_SOURCE)
+
+$(D)/libexif: $(D)/bootstrap $(ARCHIVE)/$(LIBEXIF_SOURCE)
+       $(START_BUILD)
+       $(REMOVE)/libexif-$(LIBEXIF_VER)
+       $(UNTAR)/$(LIBEXIF_SOURCE)
+       set -e; cd $(BUILD_TMP)/libexif-$(LIBEXIF_VER); \
+               $(CONFIGURE) \
+                       --prefix=/usr \
+               ; \
+               $(MAKE); \
+               $(MAKE) install prefix=/usr DESTDIR=$(TARGET_DIR)
+       $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libexif.pc
+       $(REWRITE_LIBTOOL)/libexif.la
+       $(REMOVE)/libexif-$(LIBEXIF_VER)
        $(TOUCH)
 
 $(D)/libopenthreads: $(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index 5c04e236e13e54b7737048326cdd15ae093abeed..6368419c2309c7bf955bb07db853577eae789709 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -176,6 +176,9 @@ OFGWRITE_VER = b7808ce
 OPENSSL_VER=1.0.2
 OPENSSL_SUBVER=p
 
+# libogg
+LIBOGG_VER = 1.3.3
+
 # openthreads; an object-oriented thread interface for C++ programmers
 LIBOPENTHREADS_VER=3.2