diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-03-30 15:33:48 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-03-30 15:33:48 +0200 |
| commit | 92ddcd0051d3c92824fb1db1e983423a4e0cb535 (patch) | |
| tree | c363401fae5637e97b03cca8cead1ded2bf74993 /recipes | |
| parent | e8f0a65d79dfdec380ca6bf132a9a8aef999ce4b (diff) | |
| parent | 43427019cb55bb10afff1ffd596f5aa33ee17b80 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/gtk+/gtk+_2.16.0.bb | 9 | ||||
| -rw-r--r-- | recipes/libogg/libtheora-1.0/libtheora-1.0-no-docs.patch | 33 | ||||
| -rw-r--r-- | recipes/libogg/libtheora_1.0.bb | 8 |
3 files changed, 48 insertions, 2 deletions
diff --git a/recipes/gtk+/gtk+_2.16.0.bb b/recipes/gtk+/gtk+_2.16.0.bb index 7841354727..c6505effef 100644 --- a/recipes/gtk+/gtk+_2.16.0.bb +++ b/recipes/gtk+/gtk+_2.16.0.bb @@ -1,6 +1,7 @@ require gtk+.inc DEPENDS += "cairo jasper" +PR = "r1" # disabled per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" @@ -43,3 +44,11 @@ RPROVIDES_${PN} = "libgailutil18" RCONFLICTS_${PN} = "libgailutil18" RREPLACES_${PN} = "libgailutil18" +do_stage_append() { + + # this tool is required by gnome-keyring 2.26.0 to get built + # it is written in Python and use only Python xml + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/gtk/gtk-builder-convert ${STAGING_BINDIR_NATIVE} + +} diff --git a/recipes/libogg/libtheora-1.0/libtheora-1.0-no-docs.patch b/recipes/libogg/libtheora-1.0/libtheora-1.0-no-docs.patch new file mode 100644 index 0000000000..ce1fa70940 --- /dev/null +++ b/recipes/libogg/libtheora-1.0/libtheora-1.0-no-docs.patch @@ -0,0 +1,33 @@ +diff -urN libtheora-1.0-0rig/Makefile.am libtheora-1.0/Makefile.am +--- libtheora-1.0-0rig//Makefile.am 2008-10-21 05:36:32.000000000 +0200 ++++ libtheora-1.0/Makefile.am 2009-03-16 18:16:32.000000000 +0100 +@@ -8,7 +8,7 @@ + EXAMPLES_DIR = + endif + +-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR) ++SUBDIRS = lib include m4 $(EXAMPLES_DIR) + + + # we include the whole debian/ dir in EXTRA_DIST because there's a problem +diff -urN libtheora-1.0-0rig//Makefile.in libtheora-1.0/Makefile.in +--- libtheora-1.0-0rig//Makefile.in 2008-10-29 11:36:48.000000000 +0100 ++++ libtheora-1.0/Makefile.in 2009-03-16 18:16:51.000000000 +0100 +@@ -80,7 +80,7 @@ + DATA = $(pkgconfig_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = lib include doc tests m4 examples ++DIST_SUBDIRS = lib include m4 examples + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -262,7 +262,7 @@ + AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 + @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = + @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples +-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR) ++SUBDIRS = lib include m4 $(EXAMPLES_DIR) + + # we include the whole debian/ dir in EXTRA_DIST because there's a problem + # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am diff --git a/recipes/libogg/libtheora_1.0.bb b/recipes/libogg/libtheora_1.0.bb index 0d858cdbbe..431ed39525 100644 --- a/recipes/libogg/libtheora_1.0.bb +++ b/recipes/libogg/libtheora_1.0.bb @@ -1,9 +1,10 @@ DEPENDS = "libogg libvorbis" -PR = "r1" +PR = "r3" -SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2" +SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2 \ + file://libtheora-1.0-no-docs.patch;patch=1" inherit autotools lib_package @@ -17,3 +18,6 @@ do_configure_append() { AUTOTOOLS_STAGE_PKGCONFIG = "1" +do_stage() { + autotools_stage_all +} |