fix build libjpeg (bump v1.4.2) and fix hopefully librtmp

diff --git a/make/archives.mk b/make/archives.mk
index 0aecf3606a8cbd1d779b5439e1c3b6f632c25511..eda8b736bbc9fb75302f57e4c68252687b8939f3 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -36,8 +36,8 @@ $(ARCHIVE)/fbshot-0.3.tar.gz:
 $(ARCHIVE)/freetype-2.4.9.tar.bz2:
        $(WGET) http://www.fhloston-paradise.de/freetype-2.4.9.tar.bz2
 
-$(ARCHIVE)/libjpeg-turbo-1.3.0.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/libjpeg-turbo-1.3.0.tar.gz
+$(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz:
+       $(WGET) http://sourceforge.net/projects/libjpeg-turbo/files/$(JPEG_TURBO_VER)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz
 
 $(ARCHIVE)/libbluray-0.5.0.tar.bz2:
        $(WGET) http://www.fhloston-paradise.de/libbluray-0.5.0.tar.bz2

diff --git a/make/libraries.mk b/make/libraries.mk
index 763336865f2b9d8470059b4e136a9b90f03e4aa0..1345337c9d28cf06276d077cfdae7c05e0830578 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -172,8 +172,8 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz |
                        LDFLAGS="-L$(TARGETPREFIX)/lib" \
                        ; \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) prefix="" \
-                       mandir=$(TARGETPREFIX)/.remove \
-                       sbindir=$(TARGETPREFIX)/.remove
+                       sbindir=/.remove \
+                       mandir=/.remove
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/librtmp.pc
        rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/rtmpdump-$(LIBRTMP_VER)
@@ -203,21 +203,22 @@ $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-1.6.8.tar.gz | $(TARGETPREFIX)
        $(REMOVE)/libpng-1.6.8
        touch $@
 
-$(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-1.3.0.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/libjpeg-turbo-1.3.0.tar.gz
-       pushd $(BUILD_TMP)/libjpeg-turbo-1.3.0 && \
+$(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX)
+       $(UNTAR)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz
+       pushd $(BUILD_TMP)/libjpeg-turbo-$(JPEG_TURBO_VER) && \
                export CC=$(TARGET)-gcc && \
                $(CONFIGURE) \
                        --prefix= \
                        --build=$(BUILD) \
                        --host=$(TARGET) \
-                       --enable-shared && \
+                       --enable-shared \
+                       --with-jpeg8 \
+                       --mandir=/.remove --docdir=/.remove --bindir=/.remove && \
                $(MAKE)  && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_LIBTOOL)/libjpeg.la
-       rm -rf $(TARGETPREFIX)/man &&\
-       rm -rf $(TARGETPREFIX)/share/doc &&\
-       $(REMOVE)/libjpeg-turbo-1.3.0
+       rm -f $(TARGETPREFIX)/lib/libturbojpeg* $(TARGETPREFIX)/include/turbojpeg.h
+       $(REMOVE)/libjpeg-turbo-$(JPEG_TURBO_VER)
        touch $@
 
 $(D)/libxslt: $(ARCHIVE)/libxml2-2.8.0.tar.gz $(ARCHIVE)/libxslt-git-snapshot.tar.gz | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index 407760fa2b3aa3bf7b4ae9c6edf3a6ef4d619c6c..edb7eafd2f4bdb9af4d0dc559e8e3b7d441ccfcd 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -5,6 +5,9 @@ GIFLIB_VER=5.1.1
 # curl; command line tool for transferring data with URL syntax
 CURL_VER = 7.45.0
 
+# libjpeg-turbo; a derivative of libjpeg for x86 and x86-64 processors which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression
+JPEG_TURBO_VER = 1.4.2
+
 # libupnp; portable Universal Plug and Play (UPnP) needed for ushare
 LIBUPNP_VER = 1.6.19