jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvorbis: fix tremor install into staging_dir

Browse Source 
Closes #387.

When tremor is selected, the normal libvorbis shouldn't get built and
tremer should get installed into staging_dir as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2009-07-16 15:07:20 +02:00
parent 6c243d12d9
commit bd26b5821c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -12,6 +12,7 @@
#379: update DirectFB to version 1.4.0 #379: update DirectFB to version 1.4.0
#383: gst-plugins-good: Allow soup plugin to be configured #383: gst-plugins-good: Allow soup plugin to be configured
#385: neon: Fix pkgconfig dependency #385: neon: Fix pkgconfig dependency
#387: Tremor not installed to toolchain
#391: gstreamer: Bump version to 0.10.23 #391: gstreamer: Bump version to 0.10.23
#393: gst-plugins-base: Bump version to 0.10.23 #393: gst-plugins-base: Bump version to 0.10.23
#395: gst-plugins-bad: New package #395: gst-plugins-bad: New package

14
package/multimedia/libvorbis/libvorbis.mk
View File

@ -4,6 +4,8 @@
# #
############################################################# #############################################################
ifneq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y)
LIBVORBIS_VERSION = 1.2.3 LIBVORBIS_VERSION = 1.2.3
LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE) 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)) $(eval $(call AUTOTARGETS,package/multimedia,libvorbis))
else
############################################################ ############################################################
# #
@ -67,7 +70,11 @@ $(TREMOR_DIR)/.libs: $(TREMOR_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(TREMOR_DIR) $(MAKE) CC=$(TARGET_CC) -C $(TREMOR_DIR)
touch $@ 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) \ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) \
$(if $(BR2_STRIP_none),install,install-strip) $(if $(BR2_STRIP_none),install,install-strip)
touch $@ touch $@
@ -93,9 +100,6 @@ tremor-dirclean:
# Toplevel Makefile options # Toplevel Makefile options
# #
############################################################ ############################################################
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
ifeq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y)
TARGETS+=tremor TARGETS+=tremor
endif
TARGETS+=libvorbis
endif endif