contrib: merge x264 and x26410b in the same file

Don't duplicate config options, previously the 10bits variant would
overwrite the other one so .x264 would be built in 10 bits.

Remove support for aeon aged tarball

Note: The same source code is downloaded 2 times

contrib/src/x264/rules.mak

 # x264
 
-X264_VERSION := 20050609
-X264_URL := $(CONTRIB_VIDEOLAN)/x264-$(X264_VERSION).tar.gz
 X264_GITURL := git://git.videolan.org/x264.git
 X264_SNAPURL := http://git.videolan.org/?p=x264.git;a=snapshot;h=HEAD;sf=tgz
 
 ifdef BUILD_ENCODERS
 PKGS += x264
 endif
+
 ifeq ($(call need_pkg,"x264 >= 0.86"),)
 PKGS_FOUND += x264
 endif
-DEPS_x264 =
+
+ifeq ($(call need_pkg,"x26410b"),)
+PKGS_FOUND += x26410b
+endif
 
 X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \
 	--enable-static \
@@ -25,8 +27,11 @@ else
 X264CONF += --enable-win32thread
 endif
 
-$(TARBALLS)/x264-$(X264_VERSION).tar.gz:
-	$(call download,$(X264_URL))
+$(TARBALLS)/x26410b-git.tar.xz:
+	$(call download_git,$(X264_GITURL))
+
+$(TARBALLS)/x26410b-git.tar.gz:
+	$(call download,$(X264_SNAPURL))
 
 $(TARBALLS)/x264-git.tar.xz:
 	$(call download_git,$(X264_GITURL))
@@ -34,16 +39,25 @@ $(TARBALLS)/x264-git.tar.xz:
 $(TARBALLS)/x264-git.tar.gz:
 	$(call download,$(X264_SNAPURL))
 
-X264_VERSION := git
+.sum-x26410b: x26410b-git.tar.gz
+	$(warning $@ not implemented)
+	touch $@
 
-.sum-x264: x264-$(X264_VERSION).tar.gz
+.sum-x264: x264-git.tar.gz
 	$(warning $@ not implemented)
 	touch $@
 
-x264: x264-$(X264_VERSION).tar.gz .sum-x264
-	rm -Rf x264-git
-	mkdir -p x264-git
-	$(ZCAT) "$<" | (cd x264-git && tar xv --strip-components=1)
+x264: x264-git.tar.gz .sum-x264
+	rm -Rf $@-git
+	mkdir -p $@-git
+	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
+	$(UPDATE_AUTOCONFIG)
+	$(MOVE)
+
+x26410b: x26410b-git.tar.gz .sum-x26410b
+	rm -Rf $@-git
+	mkdir -p $@-git
+	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
@@ -51,3 +65,12 @@ x264: x264-$(X264_VERSION).tar.gz .sum-x264
 	cd $< && $(HOSTVARS) ./configure $(X264CONF)
 	cd $< && $(MAKE) install
 	touch $@
+
+.x26410b: x26410b
+	cd $< && $(HOSTVARS) ./configure $(X264CONF) --bit-depth=10
+	cd $< && sed -i -e 's/libx264/libx26410b/g' Makefile config.mak
+	cd $< && sed -i -e 's/x264/x26410b/g' x264.pc
+	cd $< && mv x264.pc x26410b.pc
+	cd $< && sed -i -e 's/x264.pc/x26410b.pc/g' Makefile
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/x26410b/rules.mak

-# x264
-
-X264_VERSION := 20050609
-X264_URL := $(CONTRIB_VIDEOLAN)/x264-$(X264_VERSION).tar.gz
-X264_GITURL := git://git.videolan.org/x264.git
-X264_SNAPURL := http://git.videolan.org/?p=x264.git;a=snapshot;h=HEAD;sf=tgz
-
-ifeq ($(call need_pkg,"x26410b"),)
-PKGS_FOUND += x26410b
-endif
-DEPS_x264 =
-
-X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \
-	--enable-static \
-	--bit-depth=10 \
-	--disable-avs \
-	--disable-lavf \
-	--disable-cli \
-	--disable-ffms
-ifndef HAVE_WIN32
-X264CONF += --enable-pic
-else
-X264CONF += --enable-win32thread
-endif
-
-$(TARBALLS)/x26410b-$(X264_VERSION).tar.gz:
-	$(call download,$(X264_URL))
-
-$(TARBALLS)/x26410b-git.tar.xz:
-	$(call download_git,$(X264_GITURL))
-
-$(TARBALLS)/x26410b-git.tar.gz:
-	$(call download,$(X264_SNAPURL))
-
-X264_VERSION := git
-
-.sum-x26410b: x264-$(X264_VERSION).tar.gz
-	$(warning $@ not implemented)
-	touch $@
-
-x26410b: x26410b-$(X264_VERSION).tar.gz .sum-x26410b
-	rm -Rf x26410b-git
-	mkdir -p x26410b-git
-	$(ZCAT) "$<" | (cd x26410b-git && tar xv --strip-components=1)
-	$(UPDATE_AUTOCONFIG)
-	$(MOVE)
-
-.x26410b: x26410b
-	cd $< && $(HOSTVARS) ./configure $(X264CONF)
-	cd $< && sed -i -e 's/libx264/libx26410b/g' Makefile config.mak
-	cd $< && sed -i -e 's/x264/x26410b/g' x264.pc
-	cd $< && mv x264.pc x26410b.pc
-	cd $< && sed -i -e 's/x264.pc/x26410b.pc/g' Makefile
-	cd $< && $(MAKE) install
-	touch $@