diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 10 | ||||
| -rw-r--r-- | packages/mplayer/files/Makefile-codec-cfg.patch | 10 | ||||
| -rw-r--r-- | packages/mplayer/files/makefile-nostrip-svn.patch | 29 | ||||
| -rw-r--r-- | packages/packagekit/packagekit_git.bb | 9 |
4 files changed, 23 insertions, 35 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3e461156f7..e3d50fc52c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -81,7 +81,7 @@ SRCREV_pn-matchbox-stroke ?= "1820" SRCREV_pn-mickeyterm ?= "7b91951addfd51850a23c23ad8ba7f853c4d3416;hb=7b91951addfd51850a23c23ad8ba7f853c4d3416" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-mplayer ?= "26455" +SRCREV_pn-mplayer ?= "27047" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-navit ?= "1096" @@ -155,11 +155,11 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "4452" -SRCREV_pn-opkg-native ?= "4452" -SRCREV_pn-opkg-sdk ?= "4452" +SRCREV_pn-opkg ?= "4488" +SRCREV_pn-opkg-native ?= "4488" +SRCREV_pn-opkg-sdk ?= "4488" SRCREV_pn-oprofileui ?= "160" -SRCREV_pn-packagekit ?= "ebbbfa191257861bd19bd47ba646dce590b51858" +SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911" diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch index 78fb6e98ce..84c17a9017 100644 --- a/packages/mplayer/files/Makefile-codec-cfg.patch +++ b/packages/mplayer/files/Makefile-codec-cfg.patch @@ -1,11 +1,11 @@ ---- /tmp/Makefile 2008-04-17 21:41:29.623907292 +0200 -+++ trunk/Makefile 2008-04-17 21:42:04.164926258 +0200 -@@ -311,7 +311,7 @@ +--- /tmp/Makefile 2008-06-10 20:55:43.100403024 +0200 ++++ trunk/Makefile 2008-06-10 20:56:10.881647093 +0200 +@@ -731,7 +731,7 @@ $(CC) -o $@ $^ $(LDFLAGS_MENCODER) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) -O -I. -DCODECS2HTML $< -o $@ -+ $(BUILD_CC) -O -I. -DCODECS2HTML $< -o $@ +- $(HOST_CC) -O -I. -DCODECS2HTML -o $@ $< ++ $(BUILD_CC) -O -I. -DCODECS2HTML -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch index b1a60af312..c684001792 100644 --- a/packages/mplayer/files/makefile-nostrip-svn.patch +++ b/packages/mplayer/files/makefile-nostrip-svn.patch @@ -1,22 +1,11 @@ -upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping) - ---- /tmp/Makefile 2008-04-17 21:48:32.987984542 +0200 -+++ trunk/Makefile 2008-04-17 21:48:52.042750779 +0200 -@@ -337,7 +337,7 @@ - if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi +--- /tmp/Makefile 2008-06-10 21:05:55.613676241 +0200 ++++ trunk/Makefile 2008-06-10 21:06:30.701172833 +0200 +@@ -797,7 +797,7 @@ + $(INSTALL) -d $(BINDIR) $(CONFDIR) - install-mplayer: mplayer$(EXESUF) -- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR) -+ $(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR) + install-%: %$(EXESUF) install-dirs +- $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) ++ $(INSTALL) -m 755 $< $(BINDIR) - install-mplayer-man: - for lang in $(MAN_LANG); do \ -@@ -350,7 +350,7 @@ - done - - install-mencoder: mencoder$(EXESUF) -- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR) -+ $(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR) - for lang in $(MAN_LANG); do \ - if test "$$lang" = en ; then \ - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ + install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) + install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang)) diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index 5ed193a7cc..8e2adff2cf 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -4,13 +4,12 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" RDEPENDS_${PN} = "opkg" -PV = "0.2.1+git${SRCREV}" -PR = "r8" +PV = "0.2.3+gitr${SRCREV}" +PR = "r9" SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \ - file://disable-docbook2man.patch;patch=1 \ - file://d1e096c3267c1c9492041382b954e9327bc8bbec.patch;patch=1 \ - file://pk-nodocs.patch;patch=1" + file://disable-docbook2man.patch;patch=1" + S = "${WORKDIR}/git" |