summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/host-bottom.mk5
-rw-r--r--package/curl/Makefile2
-rw-r--r--package/kodi/Makefile16
-rw-r--r--package/kodi/patches/patch-tools_TexturePacker_Makefile_in13
-rw-r--r--package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp6
-rw-r--r--package/libgcrypt/Makefile2
-rw-r--r--package/libmicrohttpd/Makefile9
-rw-r--r--package/mesalib/Makefile2
-rw-r--r--package/nginx/Makefile39
-rw-r--r--package/nginx/files/nginx.init1
-rw-r--r--package/nginx/files/nginx.postinst4
-rw-r--r--package/openntpd/Makefile1
-rw-r--r--package/rtmpdump/Makefile4
-rw-r--r--package/rtmpdump/patches/patch-Makefile18
-rw-r--r--package/rtmpdump/patches/patch-librtmp_Makefile10
-rw-r--r--package/sdl-image/Makefile3
16 files changed, 91 insertions, 44 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 11c2aae26..303e3a93c 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -106,6 +106,11 @@ ifeq (${HOST_STYLE},manual)
endif
env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE)
@find $(STAGING_HOST_DIR) -name \*.la -exec rm {} \;
+ @for a in $(STAGING_HOST_DIR)/usr/bin/*-config; do \
+ [[ -e $$a ]] || continue; \
+ $(SED) "s,^prefix=.*,prefix=$(STAGING_HOST_DIR)/usr," $$a; \
+ chmod u+x $(STAGING_HOST_DIR)/usr/bin/$$(basename $$a); \
+ done
@touch $@
${_HOST_COOKIE}:
diff --git a/package/curl/Makefile b/package/curl/Makefile
index c30302cee..2c58dc62b 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -26,7 +26,7 @@ PKGSS_LIBCURL:= zlib
PKG_FLAVOURS_CURL:= WITH_IPV6
PKGFD_WITH_IPV6:= enable ipv6 support
-PKG_CHOICES_LIBCURL:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL
+PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL
PKGCD_WITHOUT_SSL:= use no ssl
PKGCD_WITH_OPENSSL:= use openssl for crypto
PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index c0e1866a9..267a259f5 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -12,15 +12,15 @@ PKG_SECTION:= mm/video
PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv
PKG_DEPENDS+= libass libmpeg2 libmad libdbus
PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl
-PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo
+PKG_DEPENDS+= libflac libbz2 libtiff liblzo libressl
PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng libncurses
PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate
PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd
PKG_DEPENDS+= libgpg-error libudev python2-mod-sqlite libffmpeg
PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu librt
-PKG_BUILDDEP:= boost python2 libass ffmpeg
+PKG_BUILDDEP:= boost python2 libass ffmpeg libressl
PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis
-PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
+PKG_BUILDDEP+= curl flac bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
PKG_BUILDDEP+= eudev alsa-lib glib glu libmodplug
@@ -30,6 +30,14 @@ PKG_BUILDDEP+= zip-host unzip-host
PKG_URL:= http://xbmc.org/
PKG_SITES:= http://www.openadk.org/distfiles/
+PKG_CHOICES_KODI:= WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:= with libressl
+PKGCS_WITH_LIBRESSL:= libressl
+PKGCB_WITH_LIBRESSL:= libressl
+PKGCD_WITH_OPENSSL:= with openssl
+PKGCS_WITH_OPENSSL:= libopenssl
+PKGCB_WITH_OPENSSL:= openssl
+
PKG_FLAVOURS_KODI:= WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC
PKG_FLAVOURS_KODI+= WITH_AFP WITH_WEBSERVER WITH_RTMP WITH_BLURAY
@@ -177,6 +185,8 @@ pre-configure:
(cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh)
pre-build:
+ $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" \
+ $(WRKBUILD)/tools/TexturePacker/Makefile.in
PATH='$(HOST_PATH)' \
make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
diff --git a/package/kodi/patches/patch-tools_TexturePacker_Makefile_in b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in
new file mode 100644
index 000000000..bdd6f679f
--- /dev/null
+++ b/package/kodi/patches/patch-tools_TexturePacker_Makefile_in
@@ -0,0 +1,13 @@
+--- kodi-14.0rc3.orig/tools/TexturePacker/Makefile.in 2014-12-09 14:19:32.000000000 +0100
++++ kodi-14.0rc3/tools/TexturePacker/Makefile.in 2014-12-20 19:50:10.000000000 +0100
+@@ -33,5 +33,10 @@ $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc
+ # TexturePacker run native on build system, build it with native tools
+ make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so
+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET)
++ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
++ install_name_tool -change /usr/lib/libSDL_image-1.2.0.dylib \
++ @@STAGING_HOST_DIR@@/usr/lib/libSDL_image-1.2.0.dylib \
++ $(TARGET)
++endif
+
+ include @abs_top_srcdir@/Makefile.include
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
index 1660c5a36..8780e81db 100644
--- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
+++ b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
@@ -1,6 +1,6 @@
---- kodi-14.0rc2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-05 19:38:44.000000000 -0600
-+++ kodi-14.0rc2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-07 03:43:25.308418001 -0600
-@@ -520,8 +520,8 @@ void CDVDDemuxFFmpeg::Reset()
+--- kodi-14.0rc3.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-09 14:19:32.000000000 +0100
++++ kodi-14.0rc3/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-20 04:27:04.000000000 +0100
+@@ -534,8 +534,8 @@ void CDVDDemuxFFmpeg::Reset()
void CDVDDemuxFFmpeg::Flush()
{
// naughty usage of an internal ffmpeg function
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index f25acaa28..8b2d0b835 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-asm \
post-install:
# provides own automake macros
${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/aclocal
- ${CP} ${WRKINST}//usr/share/aclocal/libgcrypt.m4 \
+ ${CP} ${WRKINST}/usr/share/aclocal/libgcrypt.m4 \
${STAGING_HOST_DIR}/usr/share/aclocal
libgcrypt-install:
diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile
index c407ed412..d2a26b4c0 100644
--- a/package/libmicrohttpd/Makefile
+++ b/package/libmicrohttpd/Makefile
@@ -4,13 +4,11 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libmicrohttpd
-PKG_VERSION:= 0.9.37
+PKG_VERSION:= 0.9.38
PKG_RELEASE:= 1
-PKG_MD5SUM:= fdf1e0534d83bbf2663f80fa7873be77
+PKG_MD5SUM:= b72efbfe7f290846015d460aea7091fe
PKG_DESCR:= library make it easy to run an webserver
PKG_SECTION:= libs/net
-PKG_DEPENDS:= libgcrypt
-PKG_BUILDDEP:= libgcrypt
PKG_URL:= http://www.gnu.org/software/libmicrohttpd/
PKG_SITES:= ${MASTER_SITE_GNU:=libmicrohttpd/}
PKG_OPTS:= dev
@@ -21,8 +19,7 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIGURE_ARGS+= --with-libgcrypt-prefix=$(STAGING_TARGET_DIR)/usr \
- --disable-spdy
+CONFIGURE_ARGS+= --disable-spdy
libmicrohttpd-install:
$(INSTALL_DIR) $(IDIR_LIBMICROHTTPD)/usr/lib
diff --git a/package/mesalib/Makefile b/package/mesalib/Makefile
index ef9eb2164..4cea294b6 100644
--- a/package/mesalib/Makefile
+++ b/package/mesalib/Makefile
@@ -32,7 +32,7 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
include $(ADK_TOPDIR)/mk/python.mk
ifeq ($(ADK_HOST_DARWIN),y)
-PYTHON:=/opt/local/bin/python2.7
+PYTHON:=/usr/bin/python2.7
endif
ifeq ($(ADK_HOST_OPENBSD),y)
PYTHON:=/usr/local/bin/python2.7
diff --git a/package/nginx/Makefile b/package/nginx/Makefile
index 804b6309f..53fe3d4f8 100644
--- a/package/nginx/Makefile
+++ b/package/nginx/Makefile
@@ -5,18 +5,22 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= nginx
PKG_VERSION:= 1.7.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fd5ab813fc1853cd8efe580ead577c3e
PKG_DESCR:= powerful http reverse proxy and webserver
PKG_SECTION:= net/http
-PKG_BUILDDEP:= openssl pcre zlib
-PKG_DEPENDS:= libopenssl libpcre libpthread zlib
+PKG_BUILDDEP:= pcre zlib
+PKG_DEPENDS:= libpcre libpthread zlib
PKG_URL:= http://nginx.org/
PKG_SITES:= http://nginx.org/download/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-# flavours for speedy and ssl
+PKG_CHOICES_NGINX:= WITHOUT_SSL WITH_OPENSSL
+PKGCD_WITHOUT_SSL:= use no ssl
+PKGCD_WITH_OPENSSL:= use openssl for crypto
+PKGCB_WITH_OPENSSL:= openssl
+PKGCS_WITH_OPENSSL:= libopenssl ca-certificates
include $(ADK_TOPDIR)/mk/package.mk
@@ -24,23 +28,27 @@ $(eval $(call PKG_template,NGINX,nginx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN
CONFIG_STYLE:= minimal
TARGET_CFLAGS+= -fPIC
-CONFIGURE_ARGS:= --prefix=/srv/nginx \
+CONFIGURE_ARGS:= --prefix=/srv/www \
--sbin-path=/usr/sbin \
- --user=nginx \
- --group=nginx \
+ --user=www \
+ --group=www \
--crossbuild=Linux::$(ADK_TARGET_ARCH) \
- --with-cc="$(TARGET_CC)" \
- --with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
- --with-ld-opt="$(TARGET_LDFLAGS)" \
+ --with-cc='$(TARGET_CC)' \
+ --with-cc-opt='$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)' \
+ --with-ld-opt='$(TARGET_LDFLAGS)' \
--conf-path=/etc/nginx/nginx.conf \
- --error-log-path=/var/log/nginx/error.log \
+ --error-log-path=/var/log/nginx-error.log \
--pid-path=/var/run/nginx.pid \
--lock-path=/var/lock/nginx.lock \
- --http-log-path=/var/log/nginx/access.log \
+ --http-log-path=/var/log/nginx-access.log \
--http-client-body-temp-path=/var/lib/nginx/body \
--http-proxy-temp-path=/var/lib/nginx/proxy \
- --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
- --with-http_ssl_module
+ --http-fastcgi-temp-path=/var/lib/nginx/fastcgi
+
+ifeq ($(ADK_PACKAGE_NGINX_WITH_OPENSSL),y)
+CONFIGURE_ARGS+= --with-http_ssl_module
+endif
+
ALL_TARGET:=
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
@@ -52,7 +60,6 @@ nginx-install:
cp $(WRKINST)/etc/nginx/$${f} \
$(IDIR_NGINX)/etc/nginx ; \
done
- $(INSTALL_DIR) $(IDIR_NGINX)/srv/nginx/html
- $(CP) $(WRKINST)/srv/nginx/html/* $(IDIR_NGINX)/srv/nginx/html
+ $(INSTALL_DIR) $(IDIR_NGINX)/srv/www
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nginx/files/nginx.init b/package/nginx/files/nginx.init
index 4bb61479a..2e391afed 100644
--- a/package/nginx/files/nginx.init
+++ b/package/nginx/files/nginx.init
@@ -12,7 +12,6 @@ autostart)
;;
start)
[ -d /var/lib/nginx ] || mkdir -p /var/lib/nginx
- [ -d /var/log/nginx ] || mkdir -p /var/log/nginx
[ -d /var/lock/nginx ] || mkdir -p /var/lock/nginx
/usr/sbin/nginx
;;
diff --git a/package/nginx/files/nginx.postinst b/package/nginx/files/nginx.postinst
index fcb1a013f..cfe33a1ef 100644
--- a/package/nginx/files/nginx.postinst
+++ b/package/nginx/files/nginx.postinst
@@ -2,6 +2,6 @@
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf nginx NO
gid=$(get_next_gid)
-add_group nginx $gid
-add_user nginx $(get_next_uid) $gid /tmp/.nginx
+add_group www $gid
+add_user www $(get_next_uid) $gid /srv/www
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index 076957f1f..81de3a9d2 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -9,7 +9,6 @@ PKG_RELEASE:= 19
PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3
PKG_DESCR:= ntp server daemon
PKG_SECTION:= net/ntp
-PKG_DEPENDS:= libopenssl
PKG_URL:= http://www.openntpd.org/
PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/
PKG_BB:= 1
diff --git a/package/rtmpdump/Makefile b/package/rtmpdump/Makefile
index 256098f4b..f92b1584c 100644
--- a/package/rtmpdump/Makefile
+++ b/package/rtmpdump/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 61509a2ae8987691f1fa28175461be96
PKG_DESCR:= toolkit for rtmp streams
-PKG_DEPENDS:= librtmp zlib libopenssl
-PKG_BUILDDEP:= openssl zlib
+PKG_DEPENDS:= librtmp zlib
+PKG_BUILDDEP:= zlib
PKG_SECTION:= mm/video
PKG_URL:= http://rtmpdump.mplayerhq.hu/
PKG_SITES:= http://www.openadk.org/distfiles
diff --git a/package/rtmpdump/patches/patch-Makefile b/package/rtmpdump/patches/patch-Makefile
index 64f950750..feab03481 100644
--- a/package/rtmpdump/patches/patch-Makefile
+++ b/package/rtmpdump/patches/patch-Makefile
@@ -1,6 +1,6 @@
--- rtmpdump-2.4.orig/Makefile 2013-12-15 14:24:48.000000000 +0100
-+++ rtmpdump-2.4/Makefile 2013-12-15 15:18:27.000000000 +0100
-@@ -1,9 +1,9 @@
++++ rtmpdump-2.4/Makefile 2014-12-19 20:43:08.000000000 +0100
+@@ -1,28 +1,31 @@
VERSION=v2.4
-prefix=/usr/local
@@ -13,7 +13,19 @@
SYS=posix
#SYS=mingw
-@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
+
+-CRYPTO=OPENSSL
++#CRYPTO=OPENSSL
+ #CRYPTO=POLARSSL
+ #CRYPTO=GNUTLS
+ LIBZ=-lz
+ LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
+ LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
+ LIB_POLARSSL=-lpolarssl $(LIBZ)
++LIB_=$(LIBZ)
+ CRYPTO_LIB=$(LIB_$(CRYPTO))
+ DEF_=-DNO_CRYPTO
+ CRYPTO_DEF=$(DEF_$(CRYPTO))
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
OPT=-O2
diff --git a/package/rtmpdump/patches/patch-librtmp_Makefile b/package/rtmpdump/patches/patch-librtmp_Makefile
index 8efd7ecb8..542622ac1 100644
--- a/package/rtmpdump/patches/patch-librtmp_Makefile
+++ b/package/rtmpdump/patches/patch-librtmp_Makefile
@@ -1,5 +1,5 @@
--- rtmpdump-2.4.orig/librtmp/Makefile 2013-12-15 14:24:48.000000000 +0100
-+++ rtmpdump-2.4/librtmp/Makefile 2013-12-15 15:20:13.000000000 +0100
++++ rtmpdump-2.4/librtmp/Makefile 2014-12-19 20:44:42.000000000 +0100
@@ -1,6 +1,6 @@
VERSION=v2.4
@@ -8,7 +8,7 @@
incdir=$(prefix)/include/librtmp
bindir=$(prefix)/bin
-@@ -11,9 +11,9 @@ INCDIR=$(DESTDIR)$(incdir)
+@@ -11,12 +11,12 @@ INCDIR=$(DESTDIR)$(incdir)
LIBDIR=$(DESTDIR)$(libdir)
MANDIR=$(DESTDIR)$(mandir)
@@ -20,7 +20,11 @@
+AR?=$(CROSS_COMPILE)ar
SYS=posix
- CRYPTO=OPENSSL
+-CRYPTO=OPENSSL
++#CRYPTO=OPENSSL
+ #CRYPTO=GNUTLS
+ DEF_POLARSSL=-DUSE_POLARSSL
+ DEF_OPENSSL=-DUSE_OPENSSL
@@ -74,8 +74,10 @@ SO_INST=$(SOINST_$(SHARED))
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index e36151902..041880117 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -27,12 +27,13 @@ $(eval $(call HOST_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEA
$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq ($(ADK_HOST_DARWIN),y)
-LDFLAGS_FOR_BUILD+= -framework Cocoa
+HOST_LDFLAGS+= -framework Cocoa
endif
AUTOTOOL_STYLE:= autogen
HOST_STYLE:= auto
HOST_CONFIGURE_ARGS+= --with-sdl-prefix='${STAGING_HOST_DIR}/usr' \
+ --disable-sdltest \
--enable-png \
--disable-webp \
--disable-jpg \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 22:02:15 +0000