aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf_samuelsson@telia.com>2011-11-16 15:17:10 +0100
committerUlf Samuelsson <ulf_samuelsson@telia.com>2011-11-21 16:50:06 +0100
commitce0b25d89bef08bfdaef906fc58d1eef6d886100 (patch)
tree38f6e1e5feea81ecbc4a08a250c5bac3a487226e
parenta80b9dbc7fa0b19806966f3e26798d488b7e0316 (diff)
downloadopenembedded-ce0b25d89bef08bfdaef906fc58d1eef6d886100.zip
openembedded-ce0b25d89bef08bfdaef906fc58d1eef6d886100.tar.gz
openembedded-ce0b25d89bef08bfdaef906fc58d1eef6d886100.tar.bz2
ffmpeg: replace hyphen w underscore
Signed-off-by: Ulf Samuelsson <ulf.samuelsson@telia.com>
-rw-r--r--recipes/ffmpeg/ffmpeg_git.bb3
-rw-r--r--recipes/ffmpeg/files/0001-texi2html-init_file.patch11
2 files changed, 13 insertions, 1 deletions
diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index 9cbd086..780c124 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -12,7 +12,8 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
DEFAULT_PREFERENCE_shr = "1"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git \
+ file://0001-texi2html-init_file.patch"
S = "${WORKDIR}/git"
B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/ffmpeg/files/0001-texi2html-init_file.patch b/recipes/ffmpeg/files/0001-texi2html-init_file.patch
new file mode 100644
index 0000000..c2f5e60
--- /dev/null
+++ b/recipes/ffmpeg/files/0001-texi2html-init_file.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -123,7 +123,7 @@
+ doc/%.html: TAG = HTML
+ doc/%.html: doc/%.texi $(SRC_PATH_BARE)/doc/t2h.init
+ $(Q)$(TEXIDEP)
+- $(M)cd doc && texi2html -monolithic --init-file $(SRC_PATH_BARE)/doc/t2h.init $(<:doc/%=%)
++ $(M)cd doc && texi2html -monolithic --init_file $(SRC_PATH_BARE)/doc/t2h.init $(<:doc/%=%)
+
+ doc/%.pod: TAG = POD
+ doc/%.pod: doc/%.texi