Merge branch 'master' of git+ssh://openadk.org/git/openadk

12 files changed, 102 insertions, 103 deletions

diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile
index b88cd7f08..a23764076 100644
--- a/package/bcm2835-bootloader/Makefile
+++ b/package/bcm2835-bootloader/Makefile
@@ -4,15 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-bootloader
-# actually 9953ce0847c04b587b694c79c5b5a4ac63f5c369 from 25.03.2014
-# https://github.com/raspberrypi/firmware
-PKG_VERSION:=		0.7
+# actually 04ba1c03780ae708c9289bce14f56933e55e9c20 from 13.04.2014
+PKG_VERSION:=		0.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7ad7e5d3ad311d88d1e82fc729042d87
+PKG_MD5SUM:=		08beaa7d66e7dd6b0ab58483d0f4ce40
 PKG_DESCR:=		bootloader for raspberry pi (bcm2835)
 PKG_SECTION:=		boot
+PKG_URL:=		https://github.com/raspberrypi/firmware
 PKG_SITES:=		http://openadk.org/distfiles/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index 12655228c..707d4e067 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -4,17 +4,19 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-vc
-# actually a8fbe2cd6a3d4455344295809f2e663373ad25cb from 25.03.2014
-# https://github.com/raspberrypi/userland
-PKG_VERSION:=		0.4
+# actually a59842a068cbd19e262701f30014499e9070fbf6 from 13.04.2014
+PKG_VERSION:=		0.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		091ae422e05a59ffc2b8908256047b7d
+PKG_MD5SUM:=		ed8c41f58e5657209cca73cb46b846d3
 PKG_DESCR:=		vc tools and libraries for raspberry pi
 PKG_SECTION:=		base
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		cmake-host
+PKG_URL:=		https://github.com/raspberrypi/userland
 PKG_SITES:=		http://openadk.org/distfiles/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 838ed551d..4ba06e495 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.2
+PKG_VERSION:=		2.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		744febca199548c9393b1f1ed05ccdd8
+PKG_MD5SUM:=		b8a1ee4964c2638f46fcc803ed453818
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
 PKG_FDEPENDS:=		libpthread
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 9e43242aa..ee0b214c4 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		5
 PKG_MD5SUM:=		e927540b6eda8b024fb0391eeaa4091c
 PKG_DESCR:=		GRUB2 bootloader
 PKG_SECTION:=		boot
-PKG_BUILDDEP:=		bison-host qemu-host
+PKG_BUILDDEP:=		bison-host
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://ftp.gnu.org/gnu/grub/
 
@@ -52,7 +52,7 @@ grub-install:
 	${INSTALL_DIR} $(IDIR_GRUB)/boot/grub/${GRUB_ARCH}
 	${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH}/*{mod,lst,img} \
 		$(IDIR_GRUB)/boot/grub/${GRUB_ARCH}/
-	${CP} ./files/core.img.${GRUB_ARCH} \
+	-${CP} ./files/core.img.${GRUB_ARCH} \
 		$(IDIR_GRUB)/boot/grub/core.img
 
 grub-tools-install:
diff --git a/package/gst-plugins-base/Makefile b/package/gst-plugins-base/Makefile
new file mode 100644
index 000000000..2759558e2
--- /dev/null
+++ b/package/gst-plugins-base/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gst-plugins-base
+PKG_VERSION:=		1.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2e75fb03ed7e4d24d88601fcac4d57aa
+PKG_DESCR:=		gstreamer base plugins
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		gstreamer
+PKG_BUILDDEP:=		gstreamer libvorbis libtheora alsa-lib
+PKG_URL:=		http://gstreamer.freedesktop.org/
+PKG_SITES:=		http://gstreamer.freedesktop.org/src/gst-plugins-base/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GST_PLUGINS_BASE,gst-plugins-base,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
+
+gst-plugins-base-install:
+	$(INSTALL_DIR) $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/
+	$(CP) $(WRKINST)/usr/lib/gstreamer-1.0/*.so \
+		$(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/
+	$(CP) $(WRKINST)/usr/lib/libgst*.so* \
+		$(IDIR_GST_PLUGINS_BASE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile
new file mode 100644
index 000000000..6a3012635
--- /dev/null
+++ b/package/gstreamer/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gstreamer
+PKG_VERSION:=		1.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		55d50f48a496799dbb0b195c9c6c6153
+PKG_DESCR:=		opensource multimedia framework
+PKG_SECTION:=		libs
+PKG_URL:=		http://gstreamer.freedesktop.org/
+PKG_SITES:=		http://gstreamer.freedesktop.org/src/gstreamer/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GSTREAMER,gstreamer,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+gstreamer-install:
+	$(INSTALL_DIR) $(IDIR_GSTREAMER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgstreamer*.so* \
+		$(IDIR_GSTREAMER)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 24d7ce1d0..e048165bd 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gtk+
-PKG_VERSION:=		2.24.6
+PKG_VERSION:=		2.24.22
 PKG_EXTRAVER:=		2.24
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4d7efde4ac24dbaa720bc0744eee8235
+PKG_MD5SUM:=		5fbbfb7637bbd571a572a2dae0e736d2
 PKG_DESCR:=		GTK+ library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in
index 2303be5c0..7732e28b9 100644
--- a/package/gtk+/patches/patch-Makefile_in
+++ b/package/gtk+/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- gtk+-2.24.6.orig/Makefile.in	2011-08-30 22:23:21.000000000 +0200
-+++ gtk+-2.24.6/Makefile.in	2011-11-08 18:27:10.745082865 +0100
-@@ -459,7 +459,7 @@ XVFB_START = \
+--- gtk+-2.24.22.orig/Makefile.in	2013-10-11 11:58:05.000000000 +0200
++++ gtk+-2.24.22/Makefile.in	2013-12-17 12:22:11.517248005 +0100
+@@ -552,7 +552,7 @@ XVFB_START = \
  	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
  
 -SRC_SUBDIRS = gdk gtk modules demos tests perf
-+SRC_SUBDIRS = gdk gtk modules tests perf
++SRC_SUBDIRS = gdk gtk modules perf
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
  
  # require automake 1.4
diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c
deleted file mode 100644
index 2a98f9002..000000000
--- a/package/gtk+/patches/patch-gtk_gtktypefuncs_c
+++ /dev/null
@@ -1,78 +0,0 @@
---- gtk+-2.24.6.orig/gtk/gtktypefuncs.c	2011-08-30 22:24:44.000000000 +0200
-+++ gtk+-2.24.6/gtk/gtktypefuncs.c	2011-11-08 18:06:50.273051952 +0100
-@@ -54,8 +54,8 @@
- *tp++ = gdk_pixbuf_simple_anim_get_type();
- *tp++ = gdk_pixbuf_simple_anim_iter_get_type();
- *tp++ = gdk_pixmap_get_type();
--*tp++ = gdk_property_state_get_type();
- *tp++ = gdk_prop_mode_get_type();
-+*tp++ = gdk_property_state_get_type();
- *tp++ = gdk_rectangle_get_type();
- *tp++ = gdk_rgb_dither_get_type();
- *tp++ = gdk_screen_get_type();
-@@ -190,14 +190,14 @@
- *tp++ = gtk_icon_view_drop_position_get_type();
- *tp++ = gtk_icon_view_get_type();
- *tp++ = gtk_identifier_get_type();
--*tp++ = gtk_image_get_type();
--*tp++ = gtk_image_menu_item_get_type();
--*tp++ = gtk_image_type_get_type();
- *tp++ = gtk_im_context_get_type();
- *tp++ = gtk_im_context_simple_get_type();
- *tp++ = gtk_im_multicontext_get_type();
- *tp++ = gtk_im_preedit_style_get_type();
- *tp++ = gtk_im_status_style_get_type();
-+*tp++ = gtk_image_get_type();
-+*tp++ = gtk_image_menu_item_get_type();
-+*tp++ = gtk_image_type_get_type();
- *tp++ = gtk_info_bar_get_type();
- *tp++ = gtk_invisible_get_type();
- *tp++ = gtk_item_get_type();
-@@ -281,10 +281,10 @@
- *tp++ = gtk_response_type_get_type();
- *tp++ = gtk_scale_button_get_type();
- *tp++ = gtk_scale_get_type();
--*tp++ = gtk_scrollbar_get_type();
--*tp++ = gtk_scrolled_window_get_type();
- *tp++ = gtk_scroll_step_get_type();
- *tp++ = gtk_scroll_type_get_type();
-+*tp++ = gtk_scrollbar_get_type();
-+*tp++ = gtk_scrolled_window_get_type();
- *tp++ = gtk_selection_data_get_type();
- *tp++ = gtk_selection_mode_get_type();
- *tp++ = gtk_sensitivity_type_get_type();
-@@ -301,11 +301,11 @@
- *tp++ = gtk_sort_type_get_type();
- *tp++ = gtk_spin_button_get_type();
- *tp++ = gtk_spin_button_update_policy_get_type();
--*tp++ = gtk_spinner_get_type();
- *tp++ = gtk_spin_type_get_type();
-+*tp++ = gtk_spinner_get_type();
- *tp++ = gtk_state_type_get_type();
--*tp++ = gtk_statusbar_get_type();
- *tp++ = gtk_status_icon_get_type();
-+*tp++ = gtk_statusbar_get_type();
- *tp++ = gtk_style_get_type();
- *tp++ = gtk_submenu_direction_get_type();
- *tp++ = gtk_submenu_placement_get_type();
-@@ -329,16 +329,16 @@
- *tp++ = gtk_toggle_action_get_type();
- *tp++ = gtk_toggle_button_get_type();
- *tp++ = gtk_toggle_tool_button_get_type();
--*tp++ = gtk_toolbar_child_type_get_type();
--*tp++ = gtk_toolbar_get_type();
--*tp++ = gtk_toolbar_space_style_get_type();
--*tp++ = gtk_toolbar_style_get_type();
- *tp++ = gtk_tool_button_get_type();
- *tp++ = gtk_tool_item_get_type();
- *tp++ = gtk_tool_item_group_get_type();
- *tp++ = gtk_tool_palette_drag_targets_get_type();
- *tp++ = gtk_tool_palette_get_type();
- *tp++ = gtk_tool_shell_get_type();
-+*tp++ = gtk_toolbar_child_type_get_type();
-+*tp++ = gtk_toolbar_get_type();
-+*tp++ = gtk_toolbar_space_style_get_type();
-+*tp++ = gtk_toolbar_style_get_type();
- *tp++ = gtk_tooltip_get_type();
- *tp++ = gtk_tree_drag_dest_get_type();
- *tp++ = gtk_tree_drag_source_get_type();
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index c36174f43..7e724dcd3 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		omxplayer
-# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014
-PKG_VERSION:=		0.4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		d4efff32305bd16315e6fa4f80ea2a98
+# actually 46616c55c2fad3dac47d17e8a6b41a16a4d6f15e from 13.04.2014
+PKG_VERSION:=		0.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1c882539dfcbc4e8efeae85ff8069cbe
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
@@ -16,6 +16,8 @@ PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre dbus
 PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 PKG_LIBC_DEPENDS:=      glibc musl
 
diff --git a/package/python2/Makefile b/package/python2/Makefile
index b5aac2032..757e6adc5 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -108,7 +108,7 @@ hostpre-configure:
 	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
-	(cd $(WRKBUILD) && patch -p0 < patch-Lib_distutils_sysconfig_py)	
+	(cd $(WRKBUILD) && ${PATCHP0} < patch-Lib_distutils_sysconfig_py)	
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in
 
@@ -119,13 +119,13 @@ hostpost-install:
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/python-config.patch
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/python-config.patch
 	(cd $(STAGING_HOST_DIR)/usr/bin && \
-		patch -p0 < $(WRKBUILD)/python-config.patch)
+		${PATCHP0} < $(WRKBUILD)/python-config.patch)
 
 pre-configure:
 	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
-	(cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
+	(cd $(WRKBUILD) && ${PATCHP0} <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in
 
diff --git a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
new file mode 100644
index 000000000..1a93e1411
--- /dev/null
+++ b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
@@ -0,0 +1,11 @@
+--- xbmc-12.3-Frodo.orig/lib/xbmc-dll-symbols/DllAvFormat.c	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/lib/xbmc-dll-symbols/DllAvFormat.c	2014-04-14 17:07:49.000000000 +0200
+@@ -110,7 +110,7 @@ void av_read_frame_flush(AVFormatContext
+ #define RELATIVE_TS_BASE (INT64_MAX - (1LL<<48))
+         if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE;
+         else                                st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
+-        st->reference_dts = AV_NOPTS_VALUE;
++        //st->reference_dts = AV_NOPTS_VALUE;
+ 
+         st->probe_packets = MAX_PROBE_PACKETS;
+ #endif