diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | package/multimedia/libvorbis/libvorbis.mk | 14 | ||||
| -rw-r--r-- | package/qtopia4/Config.in | 6 | ||||
| -rw-r--r-- | package/qtopia4/qtopia4.mk | 7 |
4 files changed, 22 insertions, 6 deletions
@@ -12,6 +12,7 @@ #379: update DirectFB to version 1.4.0 #383: gst-plugins-good: Allow soup plugin to be configured #385: neon: Fix pkgconfig dependency + #387: Tremor not installed to toolchain #391: gstreamer: Bump version to 0.10.23 #393: gst-plugins-base: Bump version to 0.10.23 #395: gst-plugins-bad: New package diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk index e7399e038..6f904089d 100644 --- a/package/multimedia/libvorbis/libvorbis.mk +++ b/package/multimedia/libvorbis/libvorbis.mk @@ -4,6 +4,8 @@ # ############################################################# +ifneq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y) + LIBVORBIS_VERSION = 1.2.3 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE) @@ -17,6 +19,7 @@ LIBVORBIS_DEPENDENCIES = uclibc host-pkgconfig libogg $(eval $(call AUTOTARGETS,package/multimedia,libvorbis)) +else ############################################################ # @@ -67,7 +70,11 @@ $(TREMOR_DIR)/.libs: $(TREMOR_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(TREMOR_DIR) touch $@ -$(TARGET_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs +$(STAGING_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs + $(MAKE) prefix=$(STAGING_DIR)/usr -C $(TREMOR_DIR) install + touch $@ + +$(TARGET_DIR)/usr/lib/tremor.so: $(STAGING_DIR)/usr/lib/tremor.so $(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) \ $(if $(BR2_STRIP_none),install,install-strip) touch $@ @@ -93,9 +100,6 @@ tremor-dirclean: # Toplevel Makefile options # ############################################################ -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -ifeq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y) TARGETS+=tremor -endif -TARGETS+=libvorbis + endif diff --git a/package/qtopia4/Config.in b/package/qtopia4/Config.in index 052431257..457b9399a 100644 --- a/package/qtopia4/Config.in +++ b/package/qtopia4/Config.in @@ -310,6 +310,12 @@ config BR2_PACKAGE_QTOPIA4_WEBKIT Build the WebKit module. If unsure, say n. +config BR2_PACKAGE_QTOPIA4_STL + bool "STL support" + help + Compile STL support. + If unsure, say n. + config BR2_PACKAGE_QTOPIA4_OPENSSL bool "Enable OpenSSL support" depends on BR2_PACKAGE_QTOPIA4_NETWORK diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index f7196f476..0d2b980e9 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -323,6 +323,12 @@ else QTOPIA4_CONFIGURE+= -no-webkit endif +ifeq ($(BR2_PACKAGE_QTOPIA4_STL),y) +QTOPIA4_CONFIGURE+= -stl +else +QTOPIA4_CONFIGURE+= -no-stl +endif + QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE))) #")) BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM))) @@ -460,7 +466,6 @@ endif -embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \ $(QTOPIA4_QCONFIG_COMMAND) \ $(QTOPIA4_CONFIGURE) \ - -no-stl \ -no-cups \ -no-nis \ -no-accessibility \ |