diff options
80 files changed, 1558 insertions, 933 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk new file mode 100644 index 000000000..072254087 --- /dev/null +++ b/mk/host-bottom.mk @@ -0,0 +1,77 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +host-extract: ${_HOST_PATCH_COOKIE} + +host-configure: +${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} + #@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ + #tsort | while read f; do \ + # cd ${WRKSRC}; \ + # case $$f in \ + # /*) \ + # find . -name "$${f#/}" -print | while read i; do \ + # touch "$$i"; \ + # done;; \ + # *) \ + # if test -e "$$f" ; then \ + # touch "$$f"; \ + # fi;; \ + # esac; \ + #done + @mkdir -p ${WRKBUILD} + @$(CMD_TRACE) "configuring... " + @cd ${WRKBUILD}; \ + for i in $$(find . -name config.sub);do \ + if [ -f $$i ]; then \ + ${CP} $$i $$i.bak; \ + ${CP} ${SCRIPT_DIR}/config.sub $$i; \ + fi; \ + done; \ + for i in $$(find . -name config.guess);do \ + if [ -f $$i ]; then \ + ${CP} $$i $$i.bak; \ + ${CP} ${SCRIPT_DIR}/config.guess $$i; \ + fi; \ + done; + cd ${WRKBUILD}; rm -f config.{cache,status}; \ + env ${HOST_CONFIGURE_ENV} \ + ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ + --program-prefix= \ + --program-suffix= \ + --prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --libexecdir=/usr/libexec \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --disable-dependency-tracking \ + --disable-libtool-lock \ + --disable-nls \ + ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) + touch $@ + +host-build: +${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} + @$(CMD_TRACE) "compiling... " + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) + touch $@ + +hpkg-install: ${ALL_HOSTINST} +host-install: +${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) + env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) + rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} + exec ${MAKE} host-extract $(MAKE_TRACE) + touch $@ + +${_HOST_COOKIE}: + exec ${MAKE} hostpackage + +hostpackage: ${ALL_HOSTDIRS} + touch ${_HOST_COOKIE} + diff --git a/mk/host.mk b/mk/host.mk new file mode 100644 index 000000000..f9326da17 --- /dev/null +++ b/mk/host.mk @@ -0,0 +1,56 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +HOST_CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ + CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ + CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \ + CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \ + LDFLAGS='$(strip ${LDFLAGS_FOR_BUILD})' + +# this is environment for 'make all' and 'make install' +HOST_MAKE_ENV?= +# this is arguments for 'make all' and 'make install' +HOST_XAKE_FLAGS?= +# this is arguments for 'make all' ONLY +HOST_MAKE_FLAGS?= +# this is arguments for 'make install' ONLY +HOST_FAKE_FLAGS?= +HOST_ALL_TARGET?= all +HOST_INSTALL_TARGET?= install + +HOST_MAKE_FLAGS+= ${HOST_XAKE_FLAGS} V=1 +HOST_FAKE_FLAGS+= ${HOST_XAKE_FLAGS} + +HOST_WRKINST= ${WRKDIR}/host + +_HOST_EXTRACT_COOKIE= ${WRKDIST}/.extract_done +_HOST_PATCH_COOKIE= ${WRKDIST}/.prepared +_HOST_CONFIGURE_COOKIE= ${WRKBUILD}/.host_configure_done +_HOST_BUILD_COOKIE= ${WRKBUILD}/.host_build_done +_HOST_FAKE_COOKIE= ${HOST_WRKINST}/.host_fake_done +_HOST_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}-host + +hostextract: ${_HOST_EXTRACT_COOKIE} +hostpatch: ${_HOST_PATCH_COOKIE} +hostconfigure: ${_HOST_CONFIGURE_COOKIE} +hostbuild: ${_HOST_BUILD_COOKIE} +hostfake: ${_HOST_FAKE_COOKIE} + +# there are some parameters to the HOST_template function +# 1.) Config.in identifier ADK_PACKAGE_$(1) +# 2.) name of the package, for single package mostly $(PKG_NAME) +# 3.) package version (upstream version) and package release (adk version), +# always $(PKG_VERSION)-$(PKG_RELEASE) + +define HOST_template +ALL_PKGOPTS+= $(1) +PKGNAME_$(1)= $(2) +HOSTDIR_$(1)= $(WRKDIR)/host +ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) +ALL_HOSTDIRS+= $${HOSTDIR_$(1)} +ALL_HOSTINST+= $(2)-hostinstall +endif + +$$(HOSTDIR_$(1)): ${_HOST_PATCH_COOKIE} ${_HOST_FAKE_COOKIE} + +endef diff --git a/mk/package.mk b/mk/package.mk index ca1b84fc3..66b3b8a25 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -122,10 +122,15 @@ ALL_POSTINST+= $(2)-install $(2)-install: endif INFO_$(1)= $(PKG_STATE_DIR)/info/$(2).list +INFO_$(1)_DEV= $(PKG_STATE_DIR)/info/$(2)-dev.list ifeq ($(ADK_PACKAGE_$(1)),y) +ifeq ($(ADK_PACKAGE_$(1)_DEV),y) +install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DEV) +else install-targets: $$(INFO_$(1)) endif +endif IDEPEND_$(1):= $$(strip $(4)) @@ -257,9 +262,9 @@ endif $$(INFO_$(1)): $$(IPKG_$(1)) $(PKG_INSTALL) $$(IPKG_$(1)) -ifneq (,$(filter dev,$(7))) + +$$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV) $(PKG_INSTALL) $$(IPKG_$(1)_DEV) -endif endef install-targets: diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 0dd93468d..d6ac45cc2 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -17,7 +17,7 @@ PKG_LIBNAME?= $(PKG_NAME) pre-configure: do-configure: post-configure: -${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} +${_CONFIGURE_COOKIE}: ${_HOST_COOKIE} ${_PATCH_COOKIE} @sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ tsort | while read f; do \ cd ${WRKSRC}; \ @@ -143,6 +143,7 @@ else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 endif + env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE) @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}.scripts' @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ @@ -158,7 +159,6 @@ endif sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \ ${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \ done - env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE) ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ @@ -169,21 +169,20 @@ ifeq (,$(filter noremove,${PKG_OPTS})) endif @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}' ifneq (,$(filter dev,${PKG_OPTS})) - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + @test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ find . -name \*.h | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + @test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ find . -name \*.pc | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - for a in ${WRKINST}/usr/bin/*-config*; do \ + @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ chmod 755 $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin/$$(basename $$a); \ done - #env ${MAKE_ENV} ${MAKE} ${PKG_LIBNAME}-dev-install $(MAKE_TRACE) endif @-cd ${WRKINST}; \ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index e2b24a587..20c7ba1f5 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -18,6 +18,8 @@ PKG_NEED_CXX:= 1 PKG_LIBNAME:= libimagemagic PKG_OPTS:= dev +PKG_ARCH_DEPENDS:= !m68k + PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK PKGSD_LIBIMAGEMAGICK:= imagemagick library PKGSC_LIBIMAGEMAGICK:= libs diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 9a8d4420a..694c6b0b1 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib -PKG_VERSION:= 8.0.5 -PKG_RELEASE:= 3 -PKG_MD5SUM:= cda5d101f43b8784fa60bdeaca4056f2 -PKG_DESCR:= MESA library +PKG_VERSION:= 9.2.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= df801a975045150790e10e2ccf32193f +PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat PKG_BUILDDEP:= libXdamage libXfixes libXxf86vm libdrm @@ -40,28 +40,13 @@ CONFIGURE_ARGS+= --disable-static \ --disable-gles1 \ --disable-gles2 \ --with-dri-drivers=${DRI_DRIVERS},swrast -CONFIGURE_ENV+= PYTHON2=/usr/bin/python +CONFIGURE_ENV+= PYTHON2=/usr/bin/python MISSING="echo" -XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile +XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} ifeq ($(ADK_NATIVE),y) XAKE_FLAGS+= RANLIB=ranlib AR=ar endif -post-extract: - (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - ./configure \ - --disable-static \ - --disable-gallium-llvm \ - --with-gallium-drivers=swrast \ - --with-driver=xlib \ - ); - ${MAKE} -C ${WRKBUILD}/src/glsl - ${CP} ${WRKBUILD}/src/glsl/glsl_compiler \ - ${STAGING_HOST_DIR}/bin/glsl_compiler - ${CP} ${WRKBUILD}/src/glsl/builtin_compiler \ - ${STAGING_HOST_DIR}/bin/builtin_compiler - ${MAKE} -C ${WRKBUILD}/src/glsl clean - mesalib-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib deleted file mode 100644 index a361c1105..000000000 --- a/package/MesaLib/patches/patch-bin_mklib +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib ---- Mesa-8.0.5.orig/bin/mklib 2012-10-24 21:03:58.000000000 +0200 -+++ Mesa-8.0.5/bin/mklib 2013-09-19 11:59:49.000000000 +0200 -@@ -333,12 +333,6 @@ case $ARCH in - # Check if objects are 32-bit and we're running in 64-bit - # environment. If so, pass -m32 flag to linker. - set ${OBJECTS} -- ABI32=`file $1 | grep 32-bit` -- ARM=`file $1 | grep ARM` -- # Do not add "-m32" option for arm. -- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then -- OPTS="-m32 ${OPTS}" -- fi - - if [ "${ALTOPTS}" ] ; then - OPTS=${ALTOPTS} -@@ -392,12 +386,6 @@ case $ARCH in - # Check if objects are 32-bit and we're running in 64-bit - # environment. If so, pass -m32 flag to linker. - set ${OBJECTS} -- ABI32=`file $1 | grep 32-bit` -- ARM=`file $1 | grep ARM` -- # Do not add "-m32" option for arm. -- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then -- OPTS="-m32 ${OPTS}" -- fi - if [ "${ALTOPTS}" ] ; then - OPTS=${ALTOPTS} - fi -@@ -466,12 +454,6 @@ case $ARCH in - # Check if objects are 32-bit and we're running in 64-bit - # environment. If so, pass -m32 flag to linker. - set ${OBJECTS} -- ABI32=`file $1 | grep 32-bit` -- if [ "${ABI32}" ] ; then -- OPTS="-m32 -shared -Wl,-Bdynamic" -- else -- OPTS="-m64 -shared -Wl,-Bdynamic" -- fi - fi - - # If using Sun C++ compiler, need to tell it not to add runpaths diff --git a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c deleted file mode 100644 index b5da190a5..000000000 --- a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c +++ /dev/null @@ -1,39 +0,0 @@ ---- Mesa-8.0.5.orig/src/gallium/auxiliary/util/u_debug_symbol.c 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c 2013-10-08 12:13:11.000000000 +0200 -@@ -151,23 +151,6 @@ debug_symbol_name_dbghelp(const void *ad - } - #endif - --#ifdef __GLIBC__ --#include <execinfo.h> -- --/* This can only provide dynamic symbols, or binary offsets into a file. -- * -- * To fix this, post-process the output with tools/addr2line.sh -- */ --static INLINE void --debug_symbol_name_glibc(const void *addr, char* buf, unsigned size) --{ -- char** syms = backtrace_symbols((void**)&addr, 1); -- strncpy(buf, syms[0], size); -- buf[size - 1] = 0; -- free(syms); --} --#endif -- - void - debug_symbol_name(const void *addr, char* buf, unsigned size) - { -@@ -176,12 +159,6 @@ debug_symbol_name(const void *addr, char - if(buf[0]) - return; - #endif -- --#ifdef __GLIBC__ -- debug_symbol_name_glibc(addr, buf, size); -- if(buf[0]) -- return; --#endif - - util_snprintf(buf, size, "%p", addr); - buf[size - 1] = 0; diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h deleted file mode 100644 index 5726c5c91..000000000 --- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h +++ /dev/null @@ -1,45 +0,0 @@ ---- Mesa-8.0.5.orig/src/gallium/include/pipe/p_config.h 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/gallium/include/pipe/p_config.h 2013-09-19 12:27:54.000000000 +0200 -@@ -111,7 +111,6 @@ - * Endian detection. - */ - --#ifdef __GLIBC__ - #include <endian.h> - - #if __BYTE_ORDER == __LITTLE_ENDIAN -@@ -120,34 +119,6 @@ - # define PIPE_ARCH_BIG_ENDIAN - #endif - --#elif defined(__APPLE__) --#include <machine/endian.h> -- --#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN --# define PIPE_ARCH_LITTLE_ENDIAN --#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN --# define PIPE_ARCH_BIG_ENDIAN --#endif -- --#elif defined(__sun) --#include <sys/isa_defs.h> -- --#if defined(_LITTLE_ENDIAN) --# define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(_BIG_ENDIAN) --# define PIPE_ARCH_BIG_ENDIAN --#endif -- --#else -- --#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) --#define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) --#define PIPE_ARCH_BIG_ENDIAN --#endif -- --#endif -- - #if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN) - #error Unknown Endianness - #endif diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile deleted file mode 100644 index f8f85b7ec..000000000 --- a/package/MesaLib/patches/patch-src_glsl_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- Mesa-8.0.5.orig/src/glsl/Makefile 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/glsl/Makefile 2013-04-30 12:25:40.000000000 +0200 -@@ -167,6 +167,6 @@ builtin_compiler: $(GLSL2_OBJECTS) $(OBJ - - builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler - @echo Regenerating builtin_function.cpp... -- $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp -+ $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp - - -include depend diff --git a/packa |