summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/fbsplash/Makefile33
-rw-r--r--package/fbsplash/patches/patch-src_ttf_c13
-rw-r--r--package/fbsplash/patches/patch-src_ttf_h13
-rw-r--r--package/mysql/Makefile72
-rw-r--r--package/mysql/patches/patch-cmake_os_Linux_cmake17
-rw-r--r--package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h22
-rw-r--r--package/mysql/patches/patch-include_my_global_h15
-rw-r--r--package/mysql/patches/patch-scripts_mysql_config_sh20
8 files changed, 0 insertions, 205 deletions
diff --git a/package/fbsplash/Makefile b/package/fbsplash/Makefile
deleted file mode 100644
index a82d6c6..0000000
--- a/package/fbsplash/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:= fbsplash
-PKG_VERSION:= 1.0
-PKG_RELEASE:= 2
-PKG_HASH:= acda1beb502c6ca6961b61c05ebd5aa27b46e4ca4b9009599578f8c25f3bb06e
-PKG_DESCR:= framebuffer splash utility
-PKG_SECTION:= sys/hw
-PKG_BUILDDEP:= libjpeg-turbo libpng freetype
-PKG_DEPENDS:= libjpeg-turbo libpng libfreetype
-PKG_URL:= https://github.com/alanhaggai/fbsplash
-PKG_SITES:= http://distfiles.openadk.org/
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,FBSPLASH,fbsplash,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-TARGET_LDFLAGS+= -lz
-CONFIGURE_ARGS+= --without-png
-
-fbsplash-install:
- $(INSTALL_DIR) $(IDIR_FBSPLASH)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libfb*.so* $(IDIR_FBSPLASH)/usr/lib
- $(INSTALL_DIR) $(IDIR_FBSPLASH)/sbin
- $(INSTALL_BIN) $(WRKINST)/sbin/{fbcondecor_helper,fbsplashctl} \
- $(IDIR_FBSPLASH)/sbin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fbsplash/patches/patch-src_ttf_c b/package/fbsplash/patches/patch-src_ttf_c
deleted file mode 100644
index 43ed238..0000000
--- a/package/fbsplash/patches/patch-src_ttf_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- fbsplash-1.0.orig/src/ttf.c 2014-03-30 12:57:21.000000000 +0200
-+++ fbsplash-1.0/src/ttf.c 2016-09-23 15:22:50.905609518 +0200
-@@ -25,8 +25,8 @@
- #include <assert.h>
-
- #include <ft2build.h>
--#include <ftoutln.h>
--#include <ttnameid.h>
-+#include <freetype/ftoutln.h>
-+#include <freetype/ttnameid.h>
-
- #include "common.h"
- #include "render.h"
diff --git a/package/fbsplash/patches/patch-src_ttf_h b/package/fbsplash/patches/patch-src_ttf_h
deleted file mode 100644
index 4c29b89..0000000
--- a/package/fbsplash/patches/patch-src_ttf_h
+++ /dev/null
@@ -1,13 +0,0 @@
---- fbsplash-1.0.orig/src/ttf.h 2014-03-30 12:57:32.000000000 +0200
-+++ fbsplash-1.0/src/ttf.h 2016-09-23 15:23:00.593974947 +0200
-@@ -1,8 +1,8 @@
- #ifndef _TTF_H
- #define _TTF_H
- #include <ft2build.h>
--#include <ftoutln.h>
--#include <ttnameid.h>
-+#include <freetype/ftoutln.h>
-+#include <freetype/ttnameid.h>
-
- #define CACHED_METRICS 0x10
- #define CACHED_BITMAP 0x01
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
deleted file mode 100644
index 1f56a91..0000000
--- a/package/mysql/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-PKG_NAME:= mysql
-PKG_VERSION:= 5.6.22
-PKG_RELEASE:= 1
-PKG_HASH:= c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6
-PKG_DESCR:= mysql client library
-PKG_SECTION:= libs/db
-PKG_DEPENDS:= libncurses zlib libevent
-PKG_BUILDDEP:= cmake-host mysql-host ncurses zlib readline libevent
-HOST_BUILDDEP:= cmake-host
-PKG_URL:= http://www.mysql.com/
-PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.6/}
-PKG_LIBNAME:= libmysqlclient
-PKG_OPTS:= dev
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call HOST_template,MYSQL,mysql,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-HOST_STYLE:= manual
-CONFIG_STYLE:= cmake
-CMAKE_FLAGS+= -DSTACK_DIRECTION=1 \
- -DHAVE_LLVM_LIBCPP=0 \
- -DWITH_EDITLINE=bundled \
- -DCURSES_LIBRARY="$(STAGING_TARGET_DIR)/usr/lib" \
- -DCURSES_INCLUDE_PATH="$(STAGING_TARGET_DIR)/usr/include"
-
-host-configure:
- cd ${WRKBUILD} && PATH='${HOST_PATH}' cmake .
-
-host-build:
- cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
- ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
-
-pre-configure:
- $(SED) "s#@@STAGING_DIR@@#${STAGING_TARGET_DIR}#" ${WRKBUILD}/scripts/mysql_config.sh
-
-mysql-hostinstall:
- $(INSTALL_BIN) ${WRKBUILD}/extra/comp_err \
- $(STAGING_HOST_DIR)/usr/bin
- $(INSTALL_BIN) ${WRKBUILD}/scripts/comp_sql \
- $(STAGING_HOST_DIR)/usr/bin
- $(INSTALL_BIN) ${WRKBUILD}/sql/gen_lex_hash \
- $(STAGING_HOST_DIR)/usr/bin
- $(INSTALL_BIN) ${WRKBUILD}/storage/perfschema/gen_pfs_lex_token \
- $(STAGING_HOST_DIR)/usr/bin
-
-post-configure:
- $(CP) $(STAGING_HOST_DIR)/usr/bin/comp_err \
- ${WRKBUILD}/extra/
- $(CP) $(STAGING_HOST_DIR)/usr/bin/comp_sql \
- ${WRKBUILD}/scripts/
- $(CP) $(STAGING_HOST_DIR)/usr/bin/gen_lex_hash \
- ${WRKBUILD}/sql/
- $(CP) $(STAGING_HOST_DIR)/usr/bin/gen_pfs_lex_token \
- ${WRKBUILD}/storage/perfschema/
-
-libmysqlclient-install:
- ${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libmysqlclient.so* \
- ${IDIR_LIBMYSQLCLIENT}/usr/lib
-
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mysql/patches/patch-cmake_os_Linux_cmake b/package/mysql/patches/patch-cmake_os_Linux_cmake
deleted file mode 100644
index 69189db..0000000
--- a/package/mysql/patches/patch-cmake_os_Linux_cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- mysql-5.6.22.orig/cmake/os/Linux.cmake 2014-11-20 23:39:51.000000000 -0600
-+++ mysql-5.6.22/cmake/os/Linux.cmake 2014-12-26 10:30:24.216372609 -0600
-@@ -22,14 +22,6 @@ INCLUDE(CheckSymbolExists)
- SET(TARGET_OS_LINUX 1)
- SET(_GNU_SOURCE 1)
-
--# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
--FOREACH(LANG C CXX)
-- STRING(REPLACE "-rdynamic" ""
-- CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
-- ${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}
-- )
--ENDFOREACH()
--
- # Ensure we have clean build for shared libraries
- # without unresolved symbols
- # Not supported with AddressSanitizer
diff --git a/package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h b/package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h
deleted file mode 100644
index 73ece99..0000000
--- a/package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysql-5.6.17.orig/cmd-line-utils/libedit/chartype.h 2014-03-14 20:07:26.000000000 +0100
-+++ mysql-5.6.17/cmd-line-utils/libedit/chartype.h 2014-04-05 06:38:33.000000000 +0200
-@@ -45,19 +45,6 @@
- * seems to actually advertise this properly, despite Unicode 3.1 having
- * been around since 2001... */
-
--/* XXXMYSQL : Added FreeBSD & AIX to bypass this check.
-- TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
--#if !defined(__NetBSD__) && !defined(__sun) \
-- && !(defined(__APPLE__) && defined(__MACH__)) \
-- && !defined(__FreeBSD__) && !defined(_AIX)
--#ifndef __STDC_ISO_10646__
--/* In many places it is assumed that the first 127 code points are ASCII
-- * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
-- * funky encoding that could break us in weird and wonderful ways. */
-- #error wchar_t must store ISO 10646 characters
--#endif
--#endif
--
- /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
- * ref: ISO/IEC DTR 19769
- */
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
deleted file mode 100644
index 37c22fd..0000000
--- a/package/mysql/patches/patch-include_my_global_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- mysql-5.6.22.orig/include/my_global.h 2014-11-20 23:39:51.000000000 -0600
-+++ mysql-5.6.22/include/my_global.h 2014-12-26 10:33:04.736371139 -0600
-@@ -769,11 +769,7 @@ inline unsigned long long my_double2ulon
- #define my_isnan(X) std::isnan(X)
- #define my_isinf(X) std::isinf(X)
- #else
-- #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
-- #define my_isfinite(X) isfinite(X)
-- #else
-- #define my_isfinite(X) finite(X)
-- #endif
-+ #define my_isfinite(X) isfinite(X)
- #define my_isnan(X) isnan(X)
- #ifdef HAVE_ISINF
- /* System-provided isinf() is available and safe to use */
diff --git a/package/mysql/patches/patch-scripts_mysql_config_sh b/package/mysql/patches/patch-scripts_mysql_config_sh
deleted file mode 100644
index 87ba2a8..0000000
--- a/package/mysql/patches/patch-scripts_mysql_config_sh
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysql-5.6.17.orig/scripts/mysql_config.sh 2014-03-14 20:07:28.000000000 +0100
-+++ mysql-5.6.17/scripts/mysql_config.sh 2014-04-29 21:45:14.000000000 +0200
-@@ -83,7 +83,7 @@ execdir='@libexecdir@'
- bindir='@bindir@'
-
- # If installed, search for the compiled in directory first (might be "lib64")
--pkglibdir='@pkglibdir@'
-+pkglibdir='@@STAGING_DIR@@@pkglibdir@'
- pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
- fix_path pkglibdir $pkglibdir_rel lib/mysql lib
-
-@@ -91,7 +91,7 @@ plugindir='@pkgplugindir@'
- plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
- fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
-
--pkgincludedir='@pkgincludedir@'
-+pkgincludedir='@@STAGING_DIR@@@pkgincludedir@'
- if [ -f "$basedir/include/mysql/mysql.h" ]; then
- pkgincludedir="$basedir/include/mysql"
- elif [ -f "$basedir/include/mysql.h" ]; then