diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 7 | ||||
| -rw-r--r-- | patches/alsa_lib-1.1.8.local.patch | 40 |
2 files changed, 1 insertions, 46 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index c7984af4..5e71333b 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -3,7 +3,7 @@ # GROUP_TARGET="native_packages"; NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " -alsa_lib apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante dbus +apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante dbus dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl giflib gnuchess graphicsmagick gzip hastyhex hexcurse hexer icoutils imagemagick infounzip infozip john lbreakout2 lcms2 less libmetalink lolcode ltris minizip mintty mlogin musl_compat musl_fts ncdu @@ -11,11 +11,6 @@ ncurses ncursestw ncursesw npth openjazz openjpeg p7zip pcre pcre2 php popt potr qpdf qrencode rpm rw sdlquake shared_mime_info slang sqlite3 tcl tdnf texinfo tiff tmux tzdb utf8proc util_linux vim vorbis_tools w32api w32lib xorriso xpdf xz yabasic zstd")"; -: ${PKG_ALSA_LIB_SHA256SUM:=3cdc3a93a6427a26d8efab4ada2152e64dd89140d981f6ffa003e85be707aedf}; -: ${PKG_ALSA_LIB_VERSION:=1.1.8}; -: ${PKG_ALSA_LIB_URL:=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PKG_ALSA_LIB_VERSION}.tar.bz2}; -: ${PKG_ALSA_LIB_CFLAGS_BUILD_EXTRA:="-D__u8=uint8_t"}; -: ${PKG_ALSA_LIB_CONFIGURE_ARGS_EXTRA:="--disable-python --with-versioned=no"}; : ${PKG_APR_SHA256SUM:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105}; : ${PKG_APR_VERSION:=1.6.5}; : ${PKG_APR_URL:=http://ftp.fau.de/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2}; diff --git a/patches/alsa_lib-1.1.8.local.patch b/patches/alsa_lib-1.1.8.local.patch deleted file mode 100644 index 5ce2742b..00000000 --- a/patches/alsa_lib-1.1.8.local.patch +++ /dev/null @@ -1,40 +0,0 @@ -Only in alsa-lib-1.1.8/include: alsa -diff -ru alsa-lib-1.1.8.orig/include/alsa-symbols.h alsa-lib-1.1.8/include/alsa-symbols.h ---- alsa-lib-1.1.8.orig/include/alsa-symbols.h 2019-01-07 13:55:38.000000000 +0100 -+++ alsa-lib-1.1.8/include/alsa-symbols.h 2019-03-24 06:05:21.993902732 +0100 -@@ -27,7 +27,12 @@ - #endif - - #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post -+#ifdef __midipix__ -+/* no .symver support */ -+#define INTERNAL(Name) INTERNAL_CONCAT2_2(, Name) -+#else - #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) -+#endif - - # define symbol_version(real, name, version) \ - __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version) -@@ -45,6 +50,8 @@ - #define use_default_symbol_version(real, name, version) \ - __asm__ (".weak " ASM_NAME(#name)); \ - __asm__ (ASM_NAME(#name) " = " ASM_NAME(#real)) -+#elif defined(__midipix__) -+#define use_default_symbol_version(real, name, version) /* nothing */ - #else - #define use_default_symbol_version(real, name, version) \ - __asm__ (".weak " ASM_NAME(#name)); \ -diff -ru alsa-lib-1.1.8.orig/include/local.h alsa-lib-1.1.8/include/local.h ---- alsa-lib-1.1.8.orig/include/local.h 2019-01-07 13:55:38.000000000 +0100 -+++ alsa-lib-1.1.8/include/local.h 2019-03-23 19:06:39.073662943 +0100 -@@ -254,8 +254,10 @@ - /* - */ - #define HAVE_GNU_LD -+#ifndef __midipix__ - #define HAVE_ELF - #define HAVE_ASM_PREVIOUS_DIRECTIVE -+#endif - - /* Stolen from libc-symbols.h in GNU glibc */ - |