* [Buildroot] [PATCH v2 1/3] package/ffmpeg: bump version to 2.6
@ 2015-03-15 16:10 Bernd Kuhls
2015-03-15 16:10 ` [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1 Bernd Kuhls
2015-03-15 16:10 ` [Buildroot] [PATCH v2 3/3] package/mesa3d-headers: " Bernd Kuhls
0 siblings, 2 replies; 8+ messages in thread
From: Bernd Kuhls @ 2015-03-15 16:10 UTC (permalink / raw)
To: buildroot
Dump two Kodi-specific patches according to
https://github.com/xbmc/xbmc/pull/6636
and update two new patches to improve hevc handling with Kodi Isengard.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: updated hash (Baruch)
package/ffmpeg/0002-asf-hacks.patch | 42 -------
...add-public-version-of-ff_read_frame_flush.patch | 54 --------
package/ffmpeg/0013-fix-ff-thread-get-format.patch | 131 ++++++++++++++++++++
.../ffmpeg/0014-hevc-avoid-unnecessary-calls.patch | 69 +++++++++++
package/ffmpeg/ffmpeg.hash | 2 +-
package/ffmpeg/ffmpeg.mk | 2 +-
6 files changed, 202 insertions(+), 98 deletions(-)
delete mode 100644 package/ffmpeg/0002-asf-hacks.patch
delete mode 100644 package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch
create mode 100644 package/ffmpeg/0013-fix-ff-thread-get-format.patch
create mode 100644 package/ffmpeg/0014-hevc-avoid-unnecessary-calls.patch
diff --git a/package/ffmpeg/0002-asf-hacks.patch b/package/ffmpeg/0002-asf-hacks.patch
deleted file mode 100644
index d0fbb2e..0000000
--- a/package/ffmpeg/0002-asf-hacks.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fbd0b8b0239d3786b941adc89322b8e49e4c768e Mon Sep 17 00:00:00 2001
-From: Joakim Plate <elupus@ecce.se>
-Date: Mon, 12 Sep 2011 21:37:17 +0200
-Subject: [PATCH 02/13] asf hacks
-
-Patch part of the XBMC patch set for ffmpeg, downloaded from
-https://github.com/xbmc/FFmpeg/.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libavformat/asfdec.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
-index 7f7bb4d..8911987 100644
---- a/libavformat/asfdec.c
-+++ b/libavformat/asfdec.c
-@@ -1549,9 +1549,20 @@ static int asf_read_seek(AVFormatContext *s, int stream_index,
- AVStream *st = s->streams[stream_index];
- int ret = 0;
-
-+ if (pts == 0) {
-+ // this is a hack since av_gen_search searches the entire file in this case
-+ av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", s->data_offset);
-+ if (avio_seek(s->pb, s->data_offset, SEEK_SET) < 0)
-+ return -1;
-+ return 0;
-+ }
-+
- if (s->packet_size <= 0)
- return -1;
-
-+ if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO)
-+ return -1;
-+
- /* Try using the protocol's read_seek if available */
- if (s->pb) {
- int ret = avio_seek_time(s->pb, stream_index, pts, flags);
---
-2.1.0
-
diff --git a/package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch b/package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch
deleted file mode 100644
index cf07bd2..0000000
--- a/package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7d7ce18ff0d24b586634fa6e631fa0eec7865aae Mon Sep 17 00:00:00 2001
-From: elupus <elupus@xbmc.org>
-Date: Tue, 1 Nov 2011 20:18:35 +0100
-Subject: [PATCH 13/13] add public version of ff_read_frame_flush
-
-We need this since we sometimes seek on the
-input stream behind ffmpeg's back. After this
-all data need to be flushed completely.
-
-Patch part of the XBMC patch set for ffmpeg, downloaded from
-https://github.com/xbmc/FFmpeg/.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libavformat/avformat.h | 5 +++++
- libavformat/utils.c | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/libavformat/avformat.h b/libavformat/avformat.h
-index 2e54ed1..3a9f292 100644
---- a/libavformat/avformat.h
-+++ b/libavformat/avformat.h
-@@ -2121,6 +2121,11 @@ int av_find_best_stream(AVFormatContext *ic,
- int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
- /**
-+ * Clear out any buffered data in context
-+ */
-+void av_read_frame_flush(AVFormatContext *s);
-+
-+/**
- * Seek to the keyframe at timestamp.
- * 'timestamp' in 'stream_index'.
- *
-diff --git a/libavformat/utils.c b/libavformat/utils.c
-index f4fb172..10dda18 100644
---- a/libavformat/utils.c
-+++ b/libavformat/utils.c
-@@ -1624,6 +1624,11 @@ void ff_read_frame_flush(AVFormatContext *s)
- }
- }
-
-+void av_read_frame_flush(AVFormatContext *s)
-+{
-+ ff_read_frame_flush(s);
-+}
-+
- void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
- {
- int i;
---
-2.1.0
-
diff --git a/package/ffmpeg/0013-fix-ff-thread-get-format.patch b/package/ffmpeg/0013-fix-ff-thread-get-format.patch
new file mode 100644
index 0000000..8e7e339
--- /dev/null
+++ b/package/ffmpeg/0013-fix-ff-thread-get-format.patch
@@ -0,0 +1,131 @@
+From b52c216539bdbee830e0d306b372037d4e0cb35f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
+Date: Sun, 8 Mar 2015 19:44:12 +0100
+Subject: [PATCH] pthread: Fix ff_thread_get_format issues when called outside
+ frame decode
+
+Patch part of the XBMC patch set for ffmpeg, downloaded from
+https://github.com/xbmc/FFmpeg/.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libavcodec/pthread_frame.c | 22 +++++++++++++++++++---
+ 1 file changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
+index 5a4ab84..c29d0a9 100644
+--- a/libavcodec/pthread_frame.c
++++ b/libavcodec/pthread_frame.c
+@@ -53,6 +53,7 @@
+ * Context used by codec threads and stored in their AVCodecInternal thread_ctx.
+ */
+ typedef struct PerThreadContext {
++ int main_thread;
+ struct FrameThreadContext *parent;
+
+ pthread_t thread;
+@@ -83,7 +84,8 @@ typedef struct PerThreadContext {
+ * Set when the codec calls get_format().
+ * State is returned to STATE_SETTING_UP afterwards.
+ */
+- STATE_SETUP_FINISHED ///< Set after the codec has called ff_thread_finish_setup().
++ STATE_SETUP_FINISHED, ///< Set after the codec has called ff_thread_finish_setup().
++ STATE_UPDATE_CONTEXT, ///< Main thread is updating its context
+ } state;
+
+ /**
+@@ -105,6 +107,7 @@ typedef struct PerThreadContext {
+ * Context stored in the client AVCodecInternal thread_ctx.
+ */
+ typedef struct FrameThreadContext {
++ int main_thread;
+ PerThreadContext *threads; ///< The contexts for each thread.
+ PerThreadContext *prev_thread; ///< The last thread submit_packet() was called on.
+
+@@ -143,6 +146,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
+ AVCodecContext *avctx = p->avctx;
+ const AVCodec *codec = avctx->codec;
+
++ av_assert0(!p->main_thread);
+ pthread_mutex_lock(&p->mutex);
+ while (1) {
+ while (p->state == STATE_INPUT_READY && !fctx->die)
+@@ -330,6 +334,8 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
+
+ pthread_mutex_lock(&p->mutex);
+
++ p->state = STATE_UPDATE_CONTEXT;
++
+ release_delayed_buffers(p);
+
+ if (prev_thread) {
+@@ -408,6 +414,7 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
+ int finished = fctx->next_finished;
+ PerThreadContext *p;
+ int err;
++ av_assert0(fctx->main_thread);
+
+ /*
+ * Submit a packet to the next decoding thread.
+@@ -515,6 +522,7 @@ void ff_thread_finish_setup(AVCodecContext *avctx) {
+
+ if (!(avctx->active_thread_type&FF_THREAD_FRAME)) return;
+
++ av_assert0(!p->main_thread);
+ if(p->state == STATE_SETUP_FINISHED){
+ av_log(avctx, AV_LOG_WARNING, "Multiple ff_thread_finish_setup() calls\n");
+ }
+@@ -549,6 +557,7 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
+ const AVCodec *codec = avctx->codec;
+ int i;
+
++ av_assert0(fctx->main_thread);
+ park_frame_worker_threads(fctx, thread_count);
+
+ if (fctx->prev_thread && fctx->prev_thread != fctx->threads)
+@@ -634,6 +643,7 @@ int ff_frame_thread_init(AVCodecContext *avctx)
+ }
+
+ avctx->internal->thread_ctx = fctx = av_mallocz(sizeof(FrameThreadContext));
++ fctx->main_thread = 1;
+
+ fctx->threads = av_mallocz_array(thread_count, sizeof(PerThreadContext));
+ pthread_mutex_init(&fctx->buffer_mutex, NULL);
+@@ -718,6 +728,7 @@ void ff_thread_flush(AVCodecContext *avctx)
+
+ if (!fctx) return;
+
++ av_assert0(fctx->main_thread);
+ park_frame_worker_threads(fctx, avctx->thread_count);
+ if (fctx->prev_thread) {
+ if (fctx->prev_thread != &fctx->threads[0])
+@@ -743,7 +754,10 @@ void ff_thread_flush(AVCodecContext *avctx)
+ int ff_thread_can_start_frame(AVCodecContext *avctx)
+ {
+ PerThreadContext *p = avctx->internal->thread_ctx;
+- if ((avctx->active_thread_type&FF_THREAD_FRAME) && p->state != STATE_SETTING_UP &&
++ if (!(avctx->active_thread_type&FF_THREAD_FRAME))
++ return 1;
++ av_assert0(!p->main_thread);
++ if (p->state != STATE_SETTING_UP &&
+ (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
+ return 0;
+ }
+@@ -762,6 +776,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
+ if (!(avctx->active_thread_type & FF_THREAD_FRAME))
+ return ff_get_buffer(avctx, f->f, flags);
+
++ av_assert0(!p->main_thread);
+ if (p->state != STATE_SETTING_UP &&
+ (avctx->codec->update_thread_context || !THREAD_SAFE_CALLBACKS(avctx))) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n");
+@@ -819,7 +834,8 @@ enum AVPixelFormat ff_thread_get_format(AVCodecContext *avctx, const enum AVPixe
+ enum AVPixelFormat res;
+ PerThreadContext *p = avctx->internal->thread_ctx;
+ if (!(avctx->active_thread_type & FF_THREAD_FRAME) || avctx->thread_safe_callbacks ||
+- avctx->get_format == avcodec_default_get_format)
++ avctx->get_format == avcodec_default_get_format ||
++ p->main_thread || p->state == STATE_UPDATE_CONTEXT)
+ return ff_get_format(avctx, fmt);
+ if (p->state != STATE_SETTING_UP) {
+ av_log(avctx, AV_LOG_ERROR, "get_format() cannot be called after ff_thread_finish_setup()\n");
diff --git a/package/ffmpeg/0014-hevc-avoid-unnecessary-calls.patch b/package/ffmpeg/0014-hevc-avoid-unnecessary-calls.patch
new file mode 100644
index 0000000..077c591
--- /dev/null
+++ b/package/ffmpeg/0014-hevc-avoid-unnecessary-calls.patch
@@ -0,0 +1,69 @@
+From ef86b05da8ad38c9c83e6f075536635647e6b799 Mon Sep 17 00:00:00 2001
+From: Rainer Hochecker <fernetmenta@online.de>
+Date: Thu, 12 Mar 2015 12:49:48 +0100
+Subject: [PATCH] hevc: avoid unnecessary calls to get_format
+
+Patch part of the XBMC patch set for ffmpeg, downloaded from
+https://github.com/xbmc/FFmpeg/.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libavcodec/hevc.c | 23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
+index b7ad29a..77b0c0c 100644
+--- a/libavcodec/hevc.c
++++ b/libavcodec/hevc.c
+@@ -280,7 +280,7 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb)
+ return 0;
+ }
+
+-static int set_sps(HEVCContext *s, const HEVCSPS *sps)
++static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fmt)
+ {
+ #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL)
+ enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
+@@ -304,13 +304,18 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps)
+ #endif
+ }
+
+- *fmt++ = sps->pix_fmt;
+- *fmt = AV_PIX_FMT_NONE;
++ if (pix_fmt == AV_PIX_FMT_NONE) {
++ *fmt++ = sps->pix_fmt;
++ *fmt = AV_PIX_FMT_NONE;
+
+- ret = ff_thread_get_format(s->avctx, pix_fmts);
+- if (ret < 0)
+- goto fail;
+- s->avctx->pix_fmt = ret;
++ ret = ff_thread_get_format(s->avctx, pix_fmts);
++ if (ret < 0)
++ goto fail;
++ s->avctx->pix_fmt = ret;
++ }
++ else {
++ s->avctx->pix_fmt = pix_fmt;
++ }
+
+ ff_set_sar(s->avctx, sps->vui.sar);
+
+@@ -420,7 +425,7 @@ static int hls_slice_header(HEVCContext *s)
+ sh->no_output_of_prior_pics_flag = 0;
+ }
+ ff_hevc_clear_refs(s);
+- ret = set_sps(s, s->sps);
++ ret = set_sps(s, s->sps, AV_PIX_FMT_NONE);
+ if (ret < 0)
+ return ret;
+
+@@ -3335,7 +3340,7 @@ static int hevc_update_thread_context(AVCodecContext *dst,
+ }
+
+ if (s->sps != s0->sps)
+- if ((ret = set_sps(s, s0->sps)) < 0)
++ if ((ret = set_sps(s, s0->sps, src->pix_fmt)) < 0)
+ return ret;
+
+ s->seq_decode = s0->seq_decode;
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
index c39174f..237d497 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 cc91c166c2b0ad9aacc533e4d5637912df583b43834c68aeec12ded7e082a286 ffmpeg-2.5.4.tar.bz2
+sha256 23c38ecc0dd6cae5e9a3c5c2c967b10480dc4f7159d094ade13b0775d1fd4791 ffmpeg-2.6.tar.bz2
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 68a28a2..419808b 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FFMPEG_VERSION = 2.5.4
+FFMPEG_VERSION = 2.6
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1
2015-03-15 16:10 [Buildroot] [PATCH v2 1/3] package/ffmpeg: bump version to 2.6 Bernd Kuhls
@ 2015-03-15 16:10 ` Bernd Kuhls
2015-03-17 22:30 ` Thomas Petazzoni
2015-03-21 8:59 ` Thomas Petazzoni
2015-03-15 16:10 ` [Buildroot] [PATCH v2 3/3] package/mesa3d-headers: " Bernd Kuhls
1 sibling, 2 replies; 8+ messages in thread
From: Bernd Kuhls @ 2015-03-15 16:10 UTC (permalink / raw)
To: buildroot
Dropped several dependencies because the "distribution tarball has been renamed
and now contains all the generated sources."
http://lists.freedesktop.org/archives/mesa-announce/2015-March/000145.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: updated hash (Baruch), added note about dependency changes (Thomas)
.../0002-Fix-runtime-error-with-uClibc.patch | 58 ++++++++++++++++++++
package/mesa3d/mesa3d.hash | 4 +-
package/mesa3d/mesa3d.mk | 12 ++--
3 files changed, 65 insertions(+), 9 deletions(-)
create mode 100644 package/mesa3d/0002-Fix-runtime-error-with-uClibc.patch
diff --git a/package/mesa3d/0002-Fix-runtime-error-with-uClibc.patch b/package/mesa3d/0002-Fix-runtime-error-with-uClibc.patch
new file mode 100644
index 0000000..6fca65f
--- /dev/null
+++ b/package/mesa3d/0002-Fix-runtime-error-with-uClibc.patch
@@ -0,0 +1,58 @@
+Fix runtime error with uClibc
+
+Patch sent upstream:
+http://lists.freedesktop.org/archives/mesa-dev/2015-March/079431.html
+
+
+From b1dae3cae9df36d9c4f64c342cfe7c106e34ec72 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 15 Mar 2015 12:23:26 +0100
+Subject: [PATCH 1/1] Fix runtime error with uClibc
+
+Patch inspired by
+https://www.winehq.org/pipermail/wine-bugs/2011-September/288987.html
+http://git.alpinelinux.org/cgit/aports/tree/main/wine/uclibc-fmaxf-fminf.patch?id=c9b491b6099eec02a835ffd05539b5c783c6c43a
+
+Starting an app using mesa3d 10.5.x, Kodi for example, fails:
+
+/usr/lib/kodi/kodi.bin: symbol 'fminf': can't resolve symbol in lib '/usr/lib/dri/i965_dri.so'.
+libGL error: unable to load driver: i965_dri.so
+libGL error: driver pointer missing
+libGL error: failed to load driver: i965
+libGL error: unable to load driver: swrast_dri.so
+libGL error: failed to load driver: swrast
+
+Here is some background information about the fminf/fmaxf situation in uClibc:
+http://thread.gmane.org/gmane.comp.lib.uclibc.general/24189
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/glsl/nir/nir_constant_expressions.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/glsl/nir/nir_constant_expressions.py b/src/glsl/nir/nir_constant_expressions.py
+index 22bc4f0..139c25a 100644
+--- a/src/glsl/nir/nir_constant_expressions.py
++++ b/src/glsl/nir/nir_constant_expressions.py
+@@ -50,6 +50,18 @@ static double copysign(double x, double y)
+ }
+ #endif
+
++#ifdef __UCLIBC__
++float fmaxf(float a, float b)
++{
++ return (a > b) ? a : b;
++}
++
++float fminf(float a, float b)
++{
++ return (a < b) ? a : b;
++}
++#endif
++
+ /**
+ * Evaluate one component of packSnorm4x8.
+ */
+--
+1.7.10.4
+
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index 9d193dc..f562469 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/mesa-announce/2015-March/000144.html
-sha256 d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735 MesaLib-10.4.6.tar.bz2
+# From http://lists.freedesktop.org/archives/mesa-announce/2015-March/000146.html
+sha256 ffc51943d15c6812ee7611d053d8980a683fbd6a4986cff567b12cc66637d679 mesa-10.5.1.tar.xz
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 811a1ef..23cc331 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,8 +5,8 @@
################################################################################
# When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 10.4.6
-MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2
+MESA3D_VERSION = 10.5.1
+MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_LICENSE = MIT, SGI, Khronos
MESA3D_LICENSE_FILES = docs/license.html
@@ -18,11 +18,8 @@ MESA3D_PROVIDES =
MESA3D_DEPENDENCIES = \
expat \
- host-bison \
- host-flex \
host-gettext \
- host-python \
- host-xutil_makedepend \
+ host-python-mako \
libdrm
ifeq ($(BR2_PACKAGE_XORG7),y)
@@ -35,7 +32,7 @@ MESA3D_DEPENDENCIES += \
xlib_libXdamage \
xlib_libXfixes \
libxcb
-MESA3D_CONF_OPTS += --enable-glx
+MESA3D_CONF_OPTS += --enable-glx --disable-mangling
# quote from mesa3d configure "Building xa requires@least one non swrast gallium driver."
ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y)
MESA3D_CONF_OPTS += --enable-xa
@@ -92,6 +89,7 @@ MESA3D_PROVIDES += libgl
MESA3D_CONF_OPTS += \
--enable-dri \
--enable-shared-glapi \
+ --enable-driglx-direct \
--with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y))
endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 3/3] package/mesa3d-headers: bump version to 10.5.1
2015-03-15 16:10 [Buildroot] [PATCH v2 1/3] package/ffmpeg: bump version to 2.6 Bernd Kuhls
2015-03-15 16:10 ` [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1 Bernd Kuhls
@ 2015-03-15 16:10 ` Bernd Kuhls
2015-03-17 22:30 ` Thomas Petazzoni
1 sibling, 1 reply; 8+ messages in thread
From: Bernd Kuhls @ 2015-03-15 16:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 5e113ce..0708a0f 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,8 +12,8 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 10.4.6
-MESA3D_HEADERS_SOURCE = MesaLib-$(MESA3D_HEADERS_VERSION).tar.bz2
+MESA3D_HEADERS_VERSION = 10.5.1
+MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
MESA3D_HEADERS_LICENSE_FILES = docs/license.html
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1
2015-03-15 16:10 ` [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1 Bernd Kuhls
@ 2015-03-17 22:30 ` Thomas Petazzoni
2015-03-23 20:40 ` Bernd Kuhls
2015-03-21 8:59 ` Thomas Petazzoni
1 sibling, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2015-03-17 22:30 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sun, 15 Mar 2015 17:10:01 +0100, Bernd Kuhls wrote:
> Dropped several dependencies because the "distribution tarball has been renamed
> and now contains all the generated sources."
> http://lists.freedesktop.org/archives/mesa-announce/2015-March/000145.html
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: updated hash (Baruch), added note about dependency changes (Thomas)
Thanks for the additional explanation, makes a lot more sense now. I've
applied your patch. I however have a comment:
> ++#ifdef __UCLIBC__
> ++float fmaxf(float a, float b)
This is really a crappy solution. I know we use it in various places,
but it simply does not work properly: if a new version of uClibc is
released with an implementation of fmaxf(), then __UCLIBC__ will still
be true, but we'll have a duplicated implementation of fmaxf().
http://autobuild.buildroot.org/results/6f6/6f62dffec0e299a36755184338524e107a932b16/build-end.log
is an excellent demonstration of why using __UCLIBC__ is bad. This
build failure is caused by the patch
package/freerdp/0001-add-support-for-uclibc.patch, wihch just like
yours adds replacement function if __UCLIBC__ is defined.
Now, enters uClibc-ng, which does implement eventfd_read() and
eventfd_write(), and bang, it fails.
Solution: use a proper autoconf test to see if fmax() is available or
not, or provide an alternate implementation only if it's not already
provided.
Since we're doing this __UCLIBC__ trick in lots of places, I've
nonetheless applied your patch, but it'd be good to use proper
solutions in the future.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 3/3] package/mesa3d-headers: bump version to 10.5.1
2015-03-15 16:10 ` [Buildroot] [PATCH v2 3/3] package/mesa3d-headers: " Bernd Kuhls
@ 2015-03-17 22:30 ` Thomas Petazzoni
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2015-03-17 22:30 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sun, 15 Mar 2015 17:10:02 +0100, Bernd Kuhls wrote:
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1
2015-03-15 16:10 ` [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1 Bernd Kuhls
2015-03-17 22:30 ` Thomas Petazzoni
@ 2015-03-21 8:59 ` Thomas Petazzoni
2015-03-21 10:39 ` Bernd Kuhls
1 sibling, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2015-03-21 8:59 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sun, 15 Mar 2015 17:10:01 +0100, Bernd Kuhls wrote:
> MESA3D_DEPENDENCIES = \
> expat \
> - host-bison \
> - host-flex \
> host-gettext \
> - host-python \
> - host-xutil_makedepend \
> + host-python-mako \
This is apparently not working well in some cases, see
http://autobuild.buildroot.net/results/1ce/1ce2509c8abb7483397c7d0f21c299095e94a254/.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1
2015-03-21 8:59 ` Thomas Petazzoni
@ 2015-03-21 10:39 ` Bernd Kuhls
0 siblings, 0 replies; 8+ messages in thread
From: Bernd Kuhls @ 2015-03-21 10:39 UTC (permalink / raw)
To: buildroot
[posted and mailed]
Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote
in news:20150321095905.0e24d32c at free-electrons.com:
> This is apparently not working well in some cases, see
> http://autobuild.buildroot.net/results/1ce/1ce2509c8abb7483397c7d0f21c299
> 095e94a254/.
Hi Thomas,
this seems to be a python2 <-> python3 problem:
$ grep -i "ge_python \|ge_python3=" .config
# BR2_PACKAGE_PYTHON is not set
BR2_PACKAGE_PYTHON3=y
host-python is compiled as
$ ls -la output/build/ | grep host-py
drwxr-xr-x 17 fli4l fli4l 4096 M?r 21 10:48 host-python3-3.4.2
drwxr-xr-x 9 fli4l fli4l 4096 M?r 21 10:48 host-python-mako-1.0.1
but mesa3d checks for python2 first which picks up /usr/bin/python on my
machine
$ grep PYTHON2 output/build/mesa3d-10.5.1/config.log
ac_cv_prog_PYTHON2=python2
PYTHON2='python2'
due to "AC_CHECK_PROGS([PYTHON2], [python2 python])" in
mesa3d/configure.ac
Adding
MESA3D_CONF_ENV += ac_cv_prog_PYTHON2=$(HOST_DIR)/usr/bin/python
to mesa3d.mk forcing the usage of host-python3 does not help either:
checking if module mako in python is installed... Traceback (most recent
call last):
File "<stdin>", line 10, in <module>
TypeError: unorderable types: map() > map()
configure: error: mako 0.3.4 or later is required.
make: *** [/home/fli4l/br3/output/build/mesa3d-10.5.1/.stamp_configured]
Fehler 1
Please note that mesa3d does not need the target version of python, only
host-python 2.x.
Is it possible to compile host-python2 parallel to host-python3 or should
I add a "depends on !BR2_PACKAGE_PYTHON3" to mesa3d/Config.in?
Regards, Bernd
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1
2015-03-17 22:30 ` Thomas Petazzoni
@ 2015-03-23 20:40 ` Bernd Kuhls
0 siblings, 0 replies; 8+ messages in thread
From: Bernd Kuhls @ 2015-03-23 20:40 UTC (permalink / raw)
To: buildroot
Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
@public.gmane.org> wrote in news:20150317233027.1aee93ce at free-electrons.com:
> Thanks for the additional explanation, makes a lot more sense now. I've
> applied your patch. I however have a comment:
>
>> ++#ifdef __UCLIBC__
>> ++float fmaxf(float a, float b)
>
> This is really a crappy solution. I know we use it in various places,
> but it simply does not work properly: if a new version of uClibc is
> released with an implementation of fmaxf(), then __UCLIBC__ will still
> be true, but we'll have a duplicated implementation of fmaxf().
Hi,
uclibc added fmaxf upstream: http://git.uclibc.org/uClibc/commit/?id=
6c4538905e65ceb203f59aaa9a61728e81c6bc0a
mesa3d/0002-Fix-runtime-error-with-uClibc.patch can be removed when the
forementioned patch is used in buildroot, a local run-time test was positive.
Let?s hope uclibc will make a new release soon ;)
Regards, Bernd
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-03-23 20:40 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-15 16:10 [Buildroot] [PATCH v2 1/3] package/ffmpeg: bump version to 2.6 Bernd Kuhls
2015-03-15 16:10 ` [Buildroot] [PATCH v2 2/3] package/mesa3d: bump version to 10.5.1 Bernd Kuhls
2015-03-17 22:30 ` Thomas Petazzoni
2015-03-23 20:40 ` Bernd Kuhls
2015-03-21 8:59 ` Thomas Petazzoni
2015-03-21 10:39 ` Bernd Kuhls
2015-03-15 16:10 ` [Buildroot] [PATCH v2 3/3] package/mesa3d-headers: " Bernd Kuhls
2015-03-17 22:30 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.