X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=contrib%2Fsrc%2Fmain.mak;h=5ec18ee28b8e3011bb3ceb3e32b22aa5fc747caf;hb=a8fe060f3f5e17af2aa7b7bafb599b80e4a3181f;hp=f2f23bd6a4a089e3255f06c4953c5a89a1ca863d;hpb=24deda448122d84407386347324c263e42e7aae9;p=vlc

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index f2f23bd6a4..5ec18ee28b 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -5,9 +5,18 @@
 
 all: install
 
-ALL_PKGS := $(patsubst ../src/%/rules.mak,%,$(wildcard ../src/*/rules.mak))
-SRC := ../src
-TARBALLS := ../tarballs
+# bootstrap configuration
+include config.mak
+
+TOPSRC ?= ../../contrib
+TOPDST ?= ..
+SRC := $(TOPSRC)/src
+TARBALLS := $(TOPSRC)/tarballs
+
+PATH :=$(abspath ../../extras/tools/build/bin):$(PATH)
+export PATH
+
+PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak))
 DATE := $(shell date +%Y%m%d)
 VPATH := $(TARBALLS)
 
@@ -17,13 +26,10 @@ SF := http://heanet.dl.sourceforge.net/sourceforge
 VIDEOLAN := http://downloads.videolan.org/pub/videolan
 CONTRIB_VIDEOLAN := $(VIDEOLAN)/testing/contrib
 
-# bootstrap configuration
-include config.mak
-
 #
 # Machine-dependent variables
 #
-PREFIX ?= ../hosts/$(HOST)
+PREFIX ?= $(TOPDST)/$(HOST)
 PREFIX := $(abspath $(PREFIX))
 ifneq ($(HOST),$(BUILD))
 HAVE_CROSS_COMPILE = 1
@@ -33,6 +39,9 @@ ifneq ($(findstring $(ARCH),i386 sparc sparc64 ppc ppc64 x86_64),)
 # This should be consistent with include/vlc_cpu.h
 HAVE_FPU = 1
 endif
+ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
+HAVE_WIN64 := 1
+endif
 
 ifdef HAVE_CROSS_COMPILE
 need_pkg = 1
@@ -83,6 +92,52 @@ STRIP := $(HOST)-strip
 endif
 endif
 
+ifdef HAVE_ANDROID
+CC :=  $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
+CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
+
+# Kludge for C++ prebuilt compiler
+EXTRA_CFLAGS += -D__STDC_VERSION__=199901L
+EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
+ifdef HAVE_NEON
+    EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
+else
+    EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include
+endif
+
+# Change HOST to not confuse autotools
+HOST=arm-eabi
+endif
+
+ifdef HAVE_MACOSX
+MACOSX_SDK=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk
+CC=gcc-4.2
+CXX=g++-4.2
+AR=ar
+LD=ld
+STRIP=strip
+RANLIB=ranlib
+EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION)
+EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION) -isysroot $(MACOSX_SDK)
+#TODO ppc
+ifeq ($(ARCH),x86_64)
+EXTRA_CFLAGS += -m64
+EXTRA_LDFLAGS += -m64
+else
+EXTRA_CFLAGS += -m32
+EXTRA_LDFLAGS += -m32
+endif
+
+XCODE_FLAGS = -sdk macosx$(OSX_VERSION)
+ifeq ($(xcodebuild -version 2>/dev/null | tee /dev/null|head -1|cut -d\  -f2|cut -d. -f1), 3)
+# XCode 3 doesn't support -arch
+else
+XCODE_FLAGS += -arch $(ARCH)
+endif
+
+endif
+
+
 EXTRA_CFLAGS += -I$(PREFIX)/include
 CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
 CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS)
@@ -98,11 +153,11 @@ PKG_CONFIG ?= pkg-config
 ifdef HAVE_CROSS_COMPILE
 # This inhibits .pc file from within the cross-compilation toolchain sysroot.
 # Hopefully, nobody ever needs that.
-PKG_CONFIG_PATH :=
-PKG_CONFIG_LIBDIR := /dev/null
+PKG_CONFIG_PATH := /usr/share/pkgconfig
+PKG_CONFIG_LIBDIR := /usr/$(HOST)/lib/pkgconfig
 export PKG_CONFIG_LIBDIR
 endif
-PKG_CONFIG_PATH += :$(PREFIX)/lib/pkgconfig
+PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(PREFIX)/lib/pkgconfig
 export PKG_CONFIG_PATH
 
 ifndef GIT
@@ -119,33 +174,36 @@ endif
 endif
 SVN ?= $(error subversion client (svn) not found!)
 
-ifndef WGET
-ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
-WGET = wget --passive -c
-endif
-endif
-ifndef WGET
 ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
-WGET = curl -L -O
+download = curl -f -L -- "$(1)" > "$@"
+else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
+download = rm -f $@.tmp && \
+	wget --passive -c -p -O $@.tmp "$(1)" && \
+	touch $@.tmp && \
+	mv $@.tmp $@
+else
+download = $(error Neither curl nor wget found!)
+endif
+
+ifeq ($(shell gzcat --version >/dev/null 2>&1 || echo FAIL),)
+ZCAT = gzcat
+else ifeq ($(shell zcat --version >/dev/null 2>&1 || echo FAIL),)
+ZCAT = zcat
+else
+ZCAT ?= $(error Gunzip client (zcat) not found!)
 endif
+
+ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
+SHA512SUM = sha512sum
+else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
+SHA512SUM = shasum -a 512
+else
+SHA512SUM = $(error SHA-512 checksumming not found!)
 endif
-WGET ?= $(error Neither wget not curl found!)
 
 #
 # Common helpers
 #
-HOSTVARS := CPPFLAGS="$(CPPFLAGS)"
-HOSTVARS += CC="$(CC)"
-HOSTVARS += CFLAGS="$(CFLAGS)"
-HOSTVARS += CXX="$(CXX)"
-HOSTVARS += CXXFLAGS="$(CXXFLAGS)"
-HOSTVARS += LD="$(LD)"
-HOSTVARS += LDFLAGS="$(LDFLAGS)"
-HOSTVARS += AR="$(AR)"
-HOSTVARS += RANLIB="$(RANLIB)"
-HOSTVARS += STRIP="$(STRIP)"
-HOSTVARS_AR += AR="$(AR) rcvu"
-
 HOSTCONF := --prefix="$(PREFIX)"
 HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)"
 HOSTCONF += --program-prefix=""
@@ -153,25 +211,42 @@ HOSTCONF += --program-prefix=""
 HOSTCONF += --enable-static --disable-shared --disable-dependency-tracking
 ifdef HAVE_WIN32
 HOSTCONF += --without-pic
+PIC :=
 else
 HOSTCONF += --with-pic
+PIC := -fPIC
 endif
 
-download = rm -f $@.tmp && \
-		$(WGET) -p -O $@.tmp $(1) && \
-		touch $@.tmp && \
-		mv $@.tmp $@
+HOSTTOOLS := \
+	CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
+	AR="$(AR)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
+	PATH="$(PREFIX)/bin:$(PATH)"
+HOSTVARS := $(HOSTTOOLS) \
+	CPPFLAGS="$(CPPFLAGS)" \
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CXXFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
+HOSTVARS_PIC := $(HOSTTOOLS) \
+	CPPFLAGS="$(CPPFLAGS) $(PIC)" \
+	CFLAGS="$(CFLAGS) $(PIC)" \
+	CXXFLAGS="$(CXXFLAGS) $(PIC)" \
+	LDFLAGS="$(LDFLAGS)"
+
 download_git = \
 	rm -Rf $(@:.tar.xz=) && \
 	$(GIT) clone $(2:%=--branch %) $(1) $(@:.tar.xz=) && \
+	(cd $(@:.tar.xz=) && $(GIT) checkout $(3:%= %)) && \
 	rm -Rf $(@:%.tar.xz=%)/.git && \
 	(cd $(dir $@) && \
-	 tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \
+	tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \
 	rm -Rf $(@:.tar.xz=)
-checksum = (cd $(TARBALLS) && $(1)sum -c -) < \
-		$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS
-CHECK_SHA256 = $(call checksum,sha512,SHA512)
-CHECK_SHA512 = $(call checksum,sha512,SHA512)
+checksum = \
+	$(foreach f,$(filter $(TARBALLS)/%,$^), \
+		grep -- " $(f:$(TARBALLS)/%=%)$$" \
+			"$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS" &&) \
+	(cd $(TARBALLS) && $(1) --check /dev/stdin) < \
+		"$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS"
+CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512)
 UNPACK = $(RM) -R $@ \
 	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \
 	$(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \
@@ -181,14 +256,16 @@ UNPACK_DIR = $(basename $(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -p1) <
 MOVE = mv $(UNPACK_DIR) $@ && touch $@
 
-RECONF = cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
+RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
+	cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
 CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
 		-DCMAKE_INSTALL_PREFIX=$(PREFIX)
 
 #
 # Per-package build rules
 #
-include ../src/*/rules.mak
+PKGS_FOUND :=
+include $(SRC)/*/rules.mak
 
 #
 # Targets
@@ -196,17 +273,23 @@ include ../src/*/rules.mak
 ifneq ($(filter $(PKGS_DISABLE),$(PKGS_ENABLE)),)
 $(error Same package(s) disabled and enabled at the same time)
 endif
-PKGS := $(filter-out $(PKGS_DISABLE),$(PKGS)) $(PKGS_ENABLE)
+# Apply automatic selection (= remove distro packages):
+PKGS_AUTOMATIC := $(filter-out $(PKGS_FOUND),$(PKGS))
+# Apply manual selection (from bootstrap):
+PKGS_MANUAL := $(sort $(PKGS_ENABLE) $(filter-out $(PKGS_DISABLE),$(PKGS_AUTOMATIC)))
+# Resolve dependencies:
+PKGS_DEPS := $(filter-out $(PKGS_FOUND) $(PKGS_MANUAL),$(sort $(foreach p,$(PKGS_MANUAL),$(DEPS_$(p)))))
+PKGS := $(sort $(PKGS_MANUAL) $(PKGS_DEPS))
 
 fetch: $(PKGS:%=.sum-%)
-fetch-all: $(ALL_PKGS:%=.sum-%)
+fetch-all: $(PKGS_ALL:%=.sum-%)
 install: $(PKGS:%=.%)
 
 mostlyclean:
-	-$(RM) $(ALL_PKGS:%=.%) $(ALL_PKGS:%=.sum-%)
+	-$(RM) $(foreach p,$(PKGS_ALL),.$(p) .sum-$(p) .dep-$(p))
 	-$(RM) toolchain.cmake
 	-$(RM) -R "$(PREFIX)"
-	-find -maxdepth 1 -type d '!' -name . -exec $(RM) -R '{}' ';'
+	-$(RM) -R */
 
 clean: mostlyclean
 	-$(RM) $(TARBALLS)/*.*
@@ -215,9 +298,44 @@ distclean: clean
 	$(RM) config.mak
 	unlink Makefile
 
+PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/$(HOST)/vlc-contrib-$(HOST)-latest.tar.bz2
+
+vlc-contrib-$(HOST)-latest.tar.bz2:
+	$(call download,$(PREBUILT_URL))
+
+prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
+	$(UNPACK) && mv $(HOST) $(TOPDST)
+	cd $(TOPDST)/$(HOST) && ./change_prefix.sh
+
 package: install
-	(cd $(PREFIX)/.. && \
-	tar cvJ $(notdir $(PREFIX))/) > ../vlc-contrib-$(HOST)-$(DATE).tar.xz
+	rm -Rf tmp/
+	mkdir -p tmp/
+	cp -r $(PREFIX) tmp/
+	# remove useless files
+	cd tmp/$(notdir $(PREFIX)); \
+		cd share; rm -Rf man doc gtk-doc info lua projectM gettext; cd ..; \
+		rm -Rf man sbin etc lib/lua lib/sidplay
+	cp $(SRC)/change_prefix.sh tmp/$(notdir $(PREFIX))/
+	cd tmp/$(notdir $(PREFIX)) && ./change_prefix.sh $(PREFIX) @@CONTRIB_PREFIX@@
+	(cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2
+
+list:
+	@echo All packages:
+	@echo '  $(PKGS_ALL)' | fmt
+	@echo Distribution-provided packages:
+	@echo '  $(PKGS_FOUND)' | fmt
+	@echo Automatically selected packages:
+	@echo '  $(PKGS_AUTOMATIC)' | fmt
+	@echo Manually deselected packages:
+	@echo '  $(PKGS_DISABLE)' | fmt
+	@echo Manually selected packages:
+	@echo '  $(PKGS_ENABLE)' | fmt
+	@echo Depended-on packages:
+	@echo '  $(PKGS_DEPS)' | fmt
+	@echo To-be-built packages:
+	@echo '  $(PKGS)' | fmt
+
+.PHONY: all fetch fetch-all install mostlyclean clean distclean package list prebuilt
 
 # CMake toolchain
 toolchain.cmake:
@@ -229,7 +347,7 @@ endif
 ifdef HAVE_MACOSX
 	echo "set(CMAKE_SYSTEM_NAME Darwin)" >> $@
 	echo "set(CMAKE_C_FLAGS $(CFLAGS))" >> $@
-	echo "set(CMAKE_CXX_FLAGS $(CFLAGS)" >> $@
+	echo "set(CMAKE_CXX_FLAGS $(CFLAGS))" >> $@
 	echo "set(CMAKE_LD_FLAGS $(LDFLAGS))" >> $@
 endif
 	echo "set(CMAKE_C_COMPILER $(CC))" >> $@
@@ -239,8 +357,6 @@ endif
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $@
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@
 
-#.SECONDEXPANSION:
-
 # Default pattern rules
 .sum-%: $(SRC)/%/SHA512SUMS
 	$(CHECK_SHA512)
@@ -249,4 +365,17 @@ endif
 .sum-%:
 	$(error Download and check target not defined for $*)
 
+# Dummy dependency on found packages
+$(patsubst %,.dep-%,$(PKGS_FOUND)): .dep-%:
+	touch $@
+
+# Real dependency on missing packages
+$(patsubst %,.dep-%,$(filter-out $(PKGS_FOUND),$(PKGS_ALL))): .dep-%: .%
+	touch -r $< $@
+
+.SECONDEXPANSION:
+
+# Dependency propagation (convert 'DEPS_foo = bar' to '.foo: .bar')
+$(foreach p,$(PKGS_ALL),.$(p)): .%: $$(foreach d,$$(DEPS_$$*),.dep-$$(d))
+
 .DELETE_ON_ERROR: