diff --git a/make/archives.mk b/make/archives.mk index b96f79b5..31d832e9 100644 --- a/make/archives.mk +++ b/make/archives.mk @@ -372,5 +372,10 @@ MTOOLS_VER=4.0.18 $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz: $(WGET) ftp://ftp.gnu.org/gnu/mtools/mtools-$(MTOOLS_VER).tar.gz +ALSA-LIB_VER = 1.1.5 +ALSA-LIB_SOURCE = alsa-lib-$(ALSA-LIB_VER).tar.bz2 +$(ARCHIVE)/$(ALSA-LIB_SOURCE): + $(WGET) ftp://ftp.alsa-project.org/pub/lib/$(ALSA-LIB_SOURCE) + $(ARCHIVE)/cacert.pem: $(WGET) https://curl.haxx.se/ca/cacert.pem diff --git a/make/gstreamer.mk b/make/gstreamer.mk index 92eacde6..699db887 100644 --- a/make/gstreamer.mk +++ b/make/gstreamer.mk @@ -475,44 +475,6 @@ $(D)/glib-networking: $(D)/gnutls $(D)/libglib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOU $(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER) touch $@ -# -# alsa-lib -# -ALSA-LIB_VER = 1.1.5 -ALSA-LIB_SOURCE = alsa-lib-$(ALSA-LIB_VER).tar.bz2 - -$(ARCHIVE)/$(ALSA-LIB_SOURCE): - $(WGET) ftp://ftp.alsa-project.org/pub/lib/$(ALSA-LIB_SOURCE) - -$(D)/alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE) - $(UNTAR)/$(ALSA-LIB_SOURCE) - set -e; cd $(BUILD_TMP)/alsa-lib-$(ALSA-LIB_VER); \ - $(PATCH)/alsa-lib-$(ALSA-LIB_VER)-link_fix.patch; \ - $(PATCH)/alsa-lib-$(ALSA-LIB_VER).patch; \ - $(CONFIGURE) \ - --prefix= \ - --datarootdir=/.remove \ - --with-alsa-devdir=/dev/snd/ \ - --with-plugindir=/lib/alsa \ - --without-debug \ - --with-debug=no \ - --with-versioned=no \ - --enable-symbolic-functions \ - --disable-aload \ - --disable-rawmidi \ - --disable-resmgr \ - --disable-old-symbols \ - --disable-alisp \ - --disable-hwdep \ - --disable-python \ - ; \ - $(MAKE); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/alsa.pc - $(REWRITE_LIBTOOL)/libasound.la - $(REMOVE)/alsa-lib-$(ALSA-LIB_VER) - touch $@ - # # libsoup # diff --git a/make/system-libs.mk b/make/system-libs.mk index 174c6290..e3683a4f 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -1107,3 +1107,32 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D $(REWRITE_LIBTOOLDEP)/libgthread-2.0.la $(REMOVE)/glib-$(GLIB_VER) touch $@ + +$(D)/alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE) + $(UNTAR)/$(ALSA-LIB_SOURCE) + set -e; cd $(BUILD_TMP)/alsa-lib-$(ALSA-LIB_VER); \ + $(PATCH)/alsa-lib-$(ALSA-LIB_VER)-link_fix.patch; \ + $(PATCH)/alsa-lib-$(ALSA-LIB_VER).patch; \ + $(CONFIGURE) \ + --prefix= \ + --datarootdir=/.remove \ + --with-alsa-devdir=/dev/snd/ \ + --with-plugindir=/lib/alsa \ + --without-debug \ + --with-debug=no \ + --with-versioned=no \ + --enable-symbolic-functions \ + --disable-aload \ + --disable-rawmidi \ + --disable-resmgr \ + --disable-old-symbols \ + --disable-alisp \ + --disable-hwdep \ + --disable-python \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGET_DIR) + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/alsa.pc + $(REWRITE_LIBTOOL)/libasound.la + $(REMOVE)/alsa-lib-$(ALSA-LIB_VER) + touch $@