diff options
| author | jstebbins <[email protected]> | 2011-10-25 02:18:15 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-10-25 02:18:15 +0000 |
| commit | 4e43bd06146941548c894321a34619e199f1d2f0 (patch) | |
| tree | 402ff66db9ce22fcbf3823772aa2d498114e1418 /contrib | |
| parent | 2c8e57bd3ee064493f2c188b08f137a3d02c6985 (diff) | |
Add optional yasm contrib
To enable, "configure --enable-local-yasm"
Ubuntu 10.04 LTS (lucid) has yasm 0.8 which is no longer compatible with
x264. This change allows us to build yasm as a contrib and use it for
building both Libav and x264 which require yasm.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4314 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 8 | ||||
| -rw-r--r-- | contrib/x264/module.defs | 7 | ||||
| -rw-r--r-- | contrib/yasm/module.defs | 5 | ||||
| -rw-r--r-- | contrib/yasm/module.rules | 2 |
4 files changed, 20 insertions, 2 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index e231c5547..b71f197e3 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,4 +1,4 @@ -$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 ZLIB)) +$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB)) $(eval $(call import.CONTRIB.defs,FFMPEG)) FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-v0.7-1318-g91038cd.tar.bz2 @@ -74,3 +74,9 @@ endif ifeq (solaris,$(BUILD.system)) FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8 endif + +ifeq (1,$(FEATURE.local_yasm)) + FFMPEG.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + FFMPEG.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" +endif + diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index 0eba9f7ab..a78f554e1 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -1,4 +1,4 @@ -$(eval $(call import.MODULE.defs,X264,x264,PTHREADW32)) +$(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32)) $(eval $(call import.CONTRIB.defs,X264)) X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2106-07efeb4.tar.gz @@ -16,3 +16,8 @@ ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)" X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)" endif + +ifeq (1,$(FEATURE.local_yasm)) + X264.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + X264.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" +endif diff --git a/contrib/yasm/module.defs b/contrib/yasm/module.defs new file mode 100644 index 000000000..90215575f --- /dev/null +++ b/contrib/yasm/module.defs @@ -0,0 +1,5 @@ +$(eval $(call import.MODULE.defs,YASM,yasm)) +$(eval $(call import.CONTRIB.defs,YASM)) + +YASM.FETCH.url = http://download.handbrake.fr/handbrake/contrib/yasm-1.1.0.tar.gz + diff --git a/contrib/yasm/module.rules b/contrib/yasm/module.rules new file mode 100644 index 000000000..ade13f959 --- /dev/null +++ b/contrib/yasm/module.rules @@ -0,0 +1,2 @@ +$(eval $(call import.MODULE.rules,YASM)) +$(eval $(call import.CONTRIB.rules,YASM)) |