config/version: set version to 4.1.1, set OS version to 4.2

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/version

@@ -1,8 +1,8 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="4.1.1"
 
 # OS_VERSION: OS Version
-  OS_VERSION="4.0"
+  OS_VERSION="4.2"
 
 # ADDON_VERSION: Addon version
   ADDON_VERSION="4.1"

packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch

@@ -0,0 +1,12 @@
+diff -Naur tvheadend-3.9.1050/Makefile tvheadend-3.9.1050.patch/Makefile
+--- tvheadend-3.9.1050/Makefile	2014-07-07 21:39:24.000000000 +0200
++++ tvheadend-3.9.1050.patch/Makefile	2014-07-14 17:57:09.483454814 +0200
+@@ -28,7 +28,7 @@
+ #
+ 
+ CFLAGS  += -g -O2
+-CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
++CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
+ CFLAGS  += -Wmissing-prototypes
+ CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
+ CFLAGS  += -D_FILE_OFFSET_BITS=64

packages/audio/alsa/alsa-lib/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="alsa-lib"
-PKG_VERSION="1.0.27.2"
+PKG_VERSION="1.0.28"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/alsa/alsa-utils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="alsa-utils"
-PKG_VERSION="1.0.27.2"
+PKG_VERSION="1.0.28"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -48,6 +48,10 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share/sounds
   rm -rf $INSTALL/usr/lib/systemd/system
 
+# remove default udev rule to restore mixer configs, we install our own.
+# so we avoid resetting our soundconfig
+  rm -rf $INSTALL/usr/lib/udev/rules.d/90-alsa-restore.rules
+
   for i in aconnect alsaucm amidi aplaymidi arecord arecordmidi aseqdump aseqnet iecset; do
     rm -rf $INSTALL/usr/bin/$i
   done

packages/audio/alsa/alsa-utils/patches/alsa-utils-upstream-001.patch

@@ -1,36 +0,0 @@
-From 180283e2307b07bbd3958d24382aab8271dd4c1d Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi.hannula@iki.fi>
-Date: Mon, 30 Sep 2013 23:46:50 +0300
-Subject: [PATCH 1/1] amixer: actually print all TLVs in a container TLV
-
-Due to a wrong indexing of tlv[] decode_tlv() always skips to the end of
-the container TLV since the used tlv[1] contains the container TLV size
-instead of the intended element size.
-
-This causes, for example, only the first HDMI channel map TLV to be
-shown.
-
-Fix the indexing to actually use the element size.
-
-Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- amixer/amixer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amixer/amixer.c b/amixer/amixer.c
-index 7727943..b83b0c3 100644
---- a/amixer/amixer.c
-+++ b/amixer/amixer.c
-@@ -468,7 +468,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
- 				return;
- 			}
- 			decode_tlv(spaces + 2, tlv + idx, tlv[idx+1] + 8);
--			idx += 2 + (tlv[1] + sizeof(unsigned int) - 1) / sizeof(unsigned int);
-+			idx += 2 + (tlv[idx+1] + sizeof(unsigned int) - 1) / sizeof(unsigned int);
- 		}
- 		break;
- 	case SND_CTL_TLVT_DB_SCALE:
--- 
-1.7.11.7
-

packages/audio/alsa/alsa-utils/patches/alsa-utils-upstream-002.patch

@@ -1,42 +0,0 @@
-From f1e991e81350e9388ab6cf04a64ac4b4389a588c Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi.hannula@iki.fi>
-Date: Tue, 1 Oct 2013 23:46:53 +0300
-Subject: [PATCH] amixer: fix indentation when printing container TLV contents
-
-decode_tlv() adds indentation in the beginning, with the expectation
-that the TLV will be printed on the line afterwards in a switch-case.
-
-However, in the case of a container TLV the switch-case simply adds
-another level of indentation and calls decode_tlv() for the inner TLVs.
-This causes the first inner TLV to be printed with too much indentation
-and double '|'.
-
-Fix that by printing "container" and a newline for container TLVs, so
-that the result is as follows:
-  : values=0,0,0,0,0,0,0,0
-  | container
-    | chmap-variable=FL,FR
-    | chmap-variable=FL,FR,LFE
-    | chmap-variable=FL,FR,FC
-
-Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- amixer/amixer.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/amixer/amixer.c b/amixer/amixer.c
-index b83b0c3..cf82892 100644
---- a/amixer/amixer.c
-+++ b/amixer/amixer.c
-@@ -460,6 +460,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
- 	}
- 	switch (type) {
- 	case SND_CTL_TLVT_CONTAINER:
-+		printf("container\n");
- 		size += sizeof(unsigned int) -1;
- 		size /= sizeof(unsigned int);
- 		while (idx < size) {
--- 
-1.7.11.7
-

packages/audio/alsa/alsa-utils/patches/alsa-utils-upstream-003.patch

@@ -1,232 +0,0 @@
-From a1992044d5813371ce71f5252187942f943b198d Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi.hannula@iki.fi>
-Date: Tue, 12 Nov 2013 00:04:02 +0200
-Subject: [PATCH] speaker-test: Fix chmapped channel selection without
- specified chmap
-
-The channel selection currently does not work properly when there is a
-driver-provided non-ALSA-traditional channel map but no manual channel
-map was explicitely requested with "-m".
-
-For example, the CEA/HDMI 8ch map is FL,FR,RLC,RRC,FC,LFE,RL,RR. Note
-that it is otherwise the same as the traditional ALSA channel map,
-except that the traditional rear speakers are considered
-rear-center speakers and the traditional side speakers are considered
-rear speakers.
-
-Speaker-test tries to play back channels in this following order:
-  0, /* Front Left  */
-  4, /* Center      */
-  1, /* Front Right */
-  7, /* Side Right  */
-  3, /* Rear Right  */
-  2, /* Rear Left   */
-  6, /* Side Left   */
-  5, /* LFE         */
-
-When it is the time to play back Side Left/Right, speaker-test tries to
-look for SL/SR in the chmap, but doesn't find it, so it just plays back
-channels 6/7 (which indeed are the side speakers, or RL/RR in this
-channel map - so the correct channels are selected).
-
-When it becomes the time to playback Rear Left/Right, speaker-test again
-tries to find RL/RR in the chmap, and this time it does find them in the
-chmap positions 6/7.
-
-So the channels 6/7 are tested twice and 2/3 are never tested.
-
-To fix this, define a generic playback order channel_order[] to be used
-when the channel map is present (but not user-defined) and generate a
-(speaker/playback number => channel number) mapping with the channels
-ordered in the following order:
-1. regular channels found in channel_order[] in the defined order,
-2. channels not found in channel_order[] ordered by channel number.
-3. UNKNOWN channels ordered by channel number.
-4. NA channels ordered by channel number.
-For channels outside the channel map just use their channel numbers (so
-they will be last after all of the above).
-
-For example, if the playback device has a fictional default channel map
-of FR,FL,UNKNOWN1,FOO,BAR,RR,RL,UNKNOWN2, the playback order will be
-FL,FR,RR,RL,FOO,BAR,UNKNOWN1,UNKNOWN2(,any_extra_channels).
-
-When the channel mapping is specified manually, the specified order is
-used for playback as before.
-
-Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- speaker-test/speaker-test.c | 113 +++++++++++++++++++++++++++++++++++---------
- 1 file changed, 91 insertions(+), 22 deletions(-)
-
-diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
-index d35065f..25b08dc 100644
---- a/speaker-test/speaker-test.c
-+++ b/speaker-test/speaker-test.c
-@@ -88,6 +88,8 @@ enum {
- #define BE_INT(v)		(v)
- #endif
- 
-+#define ARRAY_SIZE(x) (int)(sizeof(x)/sizeof(x[0]))
-+
- static char              *device      = "default";       /* playback device */
- static snd_pcm_format_t   format      = SND_PCM_FORMAT_S16; /* sample format */
- static unsigned int       rate        = 48000;	            /* stream rate */
-@@ -110,6 +112,7 @@ static snd_pcm_t *pcm_handle = NULL;
- #ifdef CONFIG_SUPPORT_CHMAP
- static snd_pcm_chmap_t *channel_map;
- static int channel_map_set;
-+static unsigned int *ordered_channels;
- #endif
- 
- static const char *const channel_name[MAX_CHANNELS] = {
-@@ -156,36 +159,94 @@ static const int	channels8[] = {
-   5, /* LFE         */
- };
- 
--static int get_mapped_channel(int chn)
--{
- #ifdef CONFIG_SUPPORT_CHMAP
--  static const int maps[MAX_CHANNELS] = {
--    SND_CHMAP_FL,
--    SND_CHMAP_FR,
--    SND_CHMAP_RL,
--    SND_CHMAP_RR,
--    SND_CHMAP_FC,
--    SND_CHMAP_LFE,
--    SND_CHMAP_SL,
--    SND_CHMAP_SR,
--  };
-+/* circular clockwise and bottom-to-top order */
-+static const int channel_order[] = {
-+  [SND_CHMAP_FLW]  =  10,
-+  [SND_CHMAP_FL]   =  20,
-+  [SND_CHMAP_TFL]  =  30,
-+  [SND_CHMAP_FLC]  =  40,
-+  [SND_CHMAP_TFLC] =  50,
-+  [SND_CHMAP_FC]   =  60,
-+  [SND_CHMAP_TFC]  =  70,
-+  [SND_CHMAP_FRC]  =  80,
-+  [SND_CHMAP_TFRC] =  90,
-+  [SND_CHMAP_FR]   = 100,
-+  [SND_CHMAP_TFR]  = 110,
-+  [SND_CHMAP_FRW]  = 120,
-+  [SND_CHMAP_SR]   = 130,
-+  [SND_CHMAP_TSR]  = 140,
-+  [SND_CHMAP_RR]   = 150,
-+  [SND_CHMAP_TRR]  = 160,
-+  [SND_CHMAP_RRC]  = 170,
-+  [SND_CHMAP_RC]   = 180,
-+  [SND_CHMAP_TRC]  = 190,
-+  [SND_CHMAP_RLC]  = 200,
-+  [SND_CHMAP_RL]   = 210,
-+  [SND_CHMAP_TRL]  = 220,
-+  [SND_CHMAP_SL]   = 230,
-+  [SND_CHMAP_TSL]  = 240,
-+  [SND_CHMAP_BC]   = 250,
-+  [SND_CHMAP_TC]   = 260,
-+  [SND_CHMAP_LLFE] = 270,
-+  [SND_CHMAP_LFE]  = 280,
-+  [SND_CHMAP_RLFE] = 290,
-+  /* not in table  = 10000 */
-+  [SND_CHMAP_UNKNOWN] = 20000,
-+  [SND_CHMAP_NA]      = 30000,
-+};
- 
--  if (channel_map && maps[chn]) {
--    int i;
--    for (i = 0; i < channel_map->channels; i++) {
--      if (channel_map->pos[i] == maps[chn])
--	return i;
--    }
-+static int chpos_cmp(const void *chnum1p, const void *chnum2p)
-+{
-+  int chnum1 = *(int *)chnum1p;
-+  int chnum2 = *(int *)chnum2p;
-+  int chpos1 = channel_map->pos[chnum1];
-+  int chpos2 = channel_map->pos[chnum2];
-+  int weight1 = 10000;
-+  int weight2 = 10000;
-+
-+  if (chpos1 < ARRAY_SIZE(channel_order) && channel_order[chpos1])
-+    weight1 = channel_order[chpos1];
-+  if (chpos2 < ARRAY_SIZE(channel_order) && channel_order[chpos2])
-+    weight2 = channel_order[chpos2];
-+
-+  if (weight1 == weight2) {
-+    /* order by channel number if both have the same position (e.g. UNKNOWN)
-+     * or if neither is in channel_order[] */
-+    return chnum1 - chnum2;
-   }
--#endif
--  return chn;
-+
-+  /* order according to channel_order[] */
-+  return weight1 - weight2;
-+}
-+
-+static int *order_channels(void)
-+{
-+  /* create a (playback order => channel number) table with channels ordered
-+   * according to channel_order[] values */
-+  int i;
-+  int *ordered_chs;
-+
-+  ordered_chs = calloc(channel_map->channels, sizeof(*ordered_chs));
-+  if (!ordered_chs)
-+    return NULL;
-+
-+  for (i = 0; i < channel_map->channels; i++)
-+    ordered_chs[i] = i;
-+
-+  qsort(ordered_chs, channel_map->channels, sizeof(*ordered_chs), chpos_cmp);
-+
-+  return ordered_chs;
- }
-+#endif
- 
- static int get_speaker_channel(int chn)
- {
- #ifdef CONFIG_SUPPORT_CHMAP
--  if (channel_map_set)
-+  if (channel_map_set || (ordered_channels && chn >= channel_map->channels))
-     return chn;
-+  if (ordered_channels)
-+    return ordered_channels[chn];
- #endif
- 
-   switch (channels) {
-@@ -200,7 +261,7 @@ static int get_speaker_channel(int chn)
-     break;
-   }
- 
--  return get_mapped_channel(chn);
-+  return chn;
- }
- 
- static const char *get_channel_name(int chn)
-@@ -611,6 +672,11 @@ static int config_chmap(snd_pcm_t *handle, const char *mapstr)
-   }
- 
-   channel_map = snd_pcm_get_chmap(handle);
-+
-+  /* create a channel order table for default layouts */
-+  if (channel_map)
-+    ordered_channels = order_channels();
-+
-   return 0;
- }
- #endif
-@@ -1230,6 +1296,9 @@ int main(int argc, char *argv[]) {
- 
- 
-   free(frames);
-+#ifdef CONFIG_SUPPORT_CHMAP
-+  free(ordered_channels);
-+#endif
- 
-   return prg_exit(EXIT_SUCCESS);
- }
--- 
-1.7.11.7
-

packages/audio/alsa/alsa-utils/patches/alsa-utils-upstream-004.patch

@@ -1,44 +0,0 @@
-From 5b0c6da0d8166cd404379740c5f75fda44ca5806 Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi.hannula@iki.fi>
-Date: Sun, 10 Nov 2013 20:29:18 +0200
-Subject: [PATCH] speaker-test: Always show chmap channel names if available
-
-Currently speaker-test only uses channel names retrieved by
-snd_pcm_chmap_long_name() when a channel map has been manually set.
-
-However, the device may provide a default (or fixed) channel map that
-differs from the traditional ALSA map, in which case wrong channel names
-are shown.
-
-Fix that by always using the name from the channel map when a channel
-map is present.
-
-Note that the names retrieved by snd_pcm_chmap_long_name() are not
-currently localized via gettext.
-
-Also note that Linux kernel HDMI driver reported wrong default channel
-maps before 56cac413dd6d43af8355f5d1f90a199b540f73fc ("ALSA: hda - hdmi:
-Fix reported channel map on common default layouts").
-
-Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- speaker-test/speaker-test.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
-index 25b08dc..101bb0d 100644
---- a/speaker-test/speaker-test.c
-+++ b/speaker-test/speaker-test.c
-@@ -267,7 +267,7 @@ static int get_speaker_channel(int chn)
- static const char *get_channel_name(int chn)
- {
- #ifdef CONFIG_SUPPORT_CHMAP
--  if (channel_map_set && chn < channel_map->channels) {
-+  if (channel_map && chn < channel_map->channels) {
-     const char *name = snd_pcm_chmap_long_name(channel_map->pos[chn]);
-     return name ? name : "Unknown";
-   }
--- 
-1.7.11.7
-

packages/audio/alsa/alsa-utils/patches/alsa-utils-upstream-005.patch

@@ -1,41 +0,0 @@
-From 58752c3ae32e03d676fa225c99c9a8dde9de39ed Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi.hannula@iki.fi>
-Date: Sun, 10 Nov 2013 20:29:19 +0200
-Subject: [PATCH] speaker-test: Show out-of-chmap channels as Unknown
-
-Currently speaker-test falls back to ALSA default channel names for
-channels out-of-chmap.
-
-This causes e.g. the 4th channel of
-$ speaker-test -c4 -Dhdmi -m "FR,FL,FC"
-to be shown as "Rear Right".
-
-Change the code to show such channels as Unknown instead, similar to
-when snd_pcm_chmap_long_name() does not know the name.
-
-Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- speaker-test/speaker-test.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
-index 101bb0d..261f399 100644
---- a/speaker-test/speaker-test.c
-+++ b/speaker-test/speaker-test.c
-@@ -267,8 +267,10 @@ static int get_speaker_channel(int chn)
- static const char *get_channel_name(int chn)
- {
- #ifdef CONFIG_SUPPORT_CHMAP
--  if (channel_map && chn < channel_map->channels) {
--    const char *name = snd_pcm_chmap_long_name(channel_map->pos[chn]);
-+  if (channel_map) {
-+    const char *name = NULL;
-+    if (chn < channel_map->channels)
-+      name = snd_pcm_chmap_long_name(channel_map->pos[chn]);
-     return name ? name : "Unknown";
-   }
- #endif
--- 
-1.7.11.7
-

packages/compress/lzo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="lzo"
-PKG_VERSION="2.06"
+PKG_VERSION="2.08"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch

@@ -0,0 +1,139 @@
+Upstream-Status: Pending
+
+Index: autoconf-2.63/bin/autoreconf.in
+===================================================================
+--- autoconf-2.63.orig/bin/autoreconf.in	2008-12-31 17:39:01.000000000 +0000
++++ autoconf-2.63/bin/autoreconf.in	2008-12-31 17:43:38.000000000 +0000
+@@ -76,6 +76,7 @@
+   -i, --install            copy missing auxiliary files
+       --no-recursive       don't rebuild sub-packages
+   -s, --symlink            with -i, install symbolic links instead of copies
++  -x, --exclude=STEPS      steps we should not run
+   -m, --make               when applicable, re-run ./configure && make
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
+ 
+@@ -136,6 +137,13 @@
+ # Recurse into subpackages
+ my $recursive = 1;
+ 
++# Steps to exclude
++my @exclude;
++my @ex;
++
++my $uses_gettext;
++my $configure_ac;
++
+ ## ---------- ##
+ ## Routines.  ##
+ ## ---------- ##
+@@ -153,6 +161,7 @@
+ 	  'B|prepend-include=s'	 => \@prepend_include,
+ 	  'i|install'            => \$install,
+ 	  's|symlink'            => \$symlink,
++  	  'x|exclude=s'          => \@exclude,
+ 	  'm|make'               => \$run_make,
+ 	  'recursive!'           => \$recursive);
+ 
+@@ -162,6 +171,8 @@
+   parse_WARNINGS;
+   parse_warnings '--warnings', @warning;
+ 
++  @exclude = map { split /,/ } @exclude;
++
+   # Even if the user specified a configure.ac, trim to get the
+   # directory, and look for configure.ac again.  Because (i) the code
+   # is simpler, and (ii) we are still able to diagnose simultaneous
+@@ -255,6 +266,11 @@
+ {
+   my ($aclocal, $flags) = @_;
+ 
++  @ex = grep (/^aclocal$/, @exclude);
++  if ($#ex != -1) {
++    return;
++  }
++
+   # aclocal 1.8+ does all this for free.  It can be recognized by its
+   # --force support.
+   if ($aclocal_supports_force)
+@@ -368,7 +384,10 @@
+     }
+   else
+     {
+-      xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
++      @ex = grep (/^autopoint$/, @exclude);
++      if ($#ex == -1) {
++        xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
++      }
+     }
+ 
+ 
+@@ -532,16 +551,17 @@
+ 	{
+ 	  $libtoolize .= " --ltdl";
+ 	}
+-      xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
+-      $rerun_aclocal = 1;
++      @ex = grep (/^libtoolize$/, @exclude);
++      if ($#ex == -1) {
++        xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
++        $rerun_aclocal = 1;
++      }
+     }
+   else
+     {
+       verb "$configure_ac: not running libtoolize: --install not given";
+     }
+ 
+-
+-
+   # ------------------- #
+   # Rerunning aclocal.  #
+   # ------------------- #
+@@ -572,7 +592,10 @@
+   # latter runs the former, and (ii) autoconf is stricter than
+   # autoheader.  So all in all, autoconf should give better error
+   # messages.
+-  xsystem ($autoconf);
++  @ex = grep (/^autoconf$/, @exclude);
++  if ($#ex == -1) {
++    xsystem ("$autoconf");
++  }
+ 
+ 
+   # -------------------- #
+@@ -593,7 +616,10 @@
+     }
+   else
+     {
+-      xsystem ($autoheader);
++      @ex = grep (/^autoheader$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$autoheader");
++      }
+     }
+ 
+ 
+@@ -610,7 +636,10 @@
+       # We should always run automake, and let it decide whether it shall
+       # update the file or not.  In fact, the effect of `$force' is already
+       # included in `$automake' via `--no-force'.
+-      xsystem ($automake);
++      @ex = grep (/^automake$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$automake");
++      }
+     }
+ 
+ 
+@@ -634,7 +663,10 @@
+ 	    }
+ 	  else
+ 	    {
+-	      xsystem ("$make");
++              @ex = grep (/^make$/, @exclude);
++              if ($#ex == -1) {
++	        xsystem ("$make");
++              }
+ 	    }
+ 	}
+     }

packages/devel/cloog/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cloog"
-PKG_VERSION="0.18.0"
+PKG_VERSION="0.18.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/devel/cloog/patches/cloog-buildfix.patch

@@ -0,0 +1,26 @@
+diff -Naur cloog-0.18.2/Makefile.am cloog-0.18.2.patch/Makefile.am
+--- cloog-0.18.2/Makefile.am	2013-12-18 13:27:49.000000000 +0100
++++ cloog-0.18.2.patch/Makefile.am	2014-06-22 17:51:19.285392908 +0200
+@@ -147,9 +147,7 @@
+ 	@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
+ 	$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
+ 	@test -z "$(DESTDIR)$(libdir)/isl" || $(mkdir_p) "$(DESTDIR)$(libdir)/isl"
+-	$(INSTALL_DATA) "$(top_srcdir)/cmake/isl-config.cmake" "$(DESTDIR)$(libdir)/isl/"
+ 	@test -z "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)" || $(mkdir_p) "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)"
+-	$(INSTALL_DATA) "$(top_srcdir)/cmake/cloog-isl-config.cmake" "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)/"
+ 
+ uninstall-local:
+ 	rm -f "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
+diff -Naur cloog-0.18.2/Makefile.in cloog-0.18.2.patch/Makefile.in
+--- cloog-0.18.2/Makefile.in	2013-12-18 13:36:08.000000000 +0100
++++ cloog-0.18.2.patch/Makefile.in	2014-06-22 17:51:27.580413087 +0200
+@@ -1342,9 +1342,7 @@
+ 	@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
+ 	$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
+ 	@test -z "$(DESTDIR)$(libdir)/isl" || $(mkdir_p) "$(DESTDIR)$(libdir)/isl"
+-	$(INSTALL_DATA) "$(top_srcdir)/cmake/isl-config.cmake" "$(DESTDIR)$(libdir)/isl/"
+ 	@test -z "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)" || $(mkdir_p) "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)"
+-	$(INSTALL_DATA) "$(top_srcdir)/cmake/cloog-isl-config.cmake" "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)/"
+ 
+ uninstall-local:
+ 	rm -f "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"

packages/devel/cmake/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="2.8.12.1"
+PKG_VERSION="3.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.cmake.org/"
-PKG_URL="http://www.cmake.org/files/v2.8/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.cmake.org/files/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
@@ -33,15 +33,13 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 configure_host() {
-  ../configure --no-qt-gui -- -DBUILD_CursesDialog=0
+  ../configure --prefix=$ROOT/$TOOLCHAIN \
+               --no-qt-gui \
+               -- \
+               -DBUILD_CursesDialog=0
 }
 
-makeinstall_host() {
+post_makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp -P bin/cmake $ROOT/$TOOLCHAIN/bin
-    cp -P bin/cpack $ROOT/$TOOLCHAIN/bin
-    cp -P bin/ctest $ROOT/$TOOLCHAIN/bin
-
   mkdir -p $ROOT/$TOOLCHAIN/etc
 
   cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF

packages/devel/dbus-glib/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="dbus-glib"
-PKG_VERSION="0.100.2"
+PKG_VERSION="0.102"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/dbus-glib/patches/dbus-glib-0.100-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur dbus-glib-0.100-old/configure.ac dbus-glib-0.100-new/configure.ac
---- dbus-glib-0.100-old/configure.ac	2012-06-25 09:26:39.000000000 -0700
-+++ dbus-glib-0.100-new/configure.ac	2012-12-29 08:54:04.000000000 -0800
-@@ -8,7 +8,7 @@
- 
- AM_INIT_AUTOMAKE([1.9])
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- # Honor aclocal flags
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"

packages/devel/file/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="file"
-PKG_VERSION="5.18"
+PKG_VERSION="5.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/devel/gettext/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gettext"
-PKG_VERSION="0.19"
+PKG_VERSION="0.19.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -32,9 +32,12 @@ PKG_LONGDESC="This is the GNU gettext package. It is interesting for authors or
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+PKG_CONFIGURE_SCRIPT="gettext-tools/configure"
+
 PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \
                          --disable-rpath \
                          --with-gnu-ld \
                          --disable-java \
                          --disable-native-java \
+                         --disable-csharp \
                          --without-emacs"

packages/devel/gettext/patches/gettext-dont_build_docs_and_examples.patch

@@ -0,0 +1,24 @@
+diff -Naur gettext-0.19.1/gettext-tools/Makefile.am gettext-0.19.1.patch/gettext-tools/Makefile.am
+--- gettext-0.19.1/gettext-tools/Makefile.am	2014-05-01 11:37:33.000000000 +0200
++++ gettext-0.19.1.patch/gettext-tools/Makefile.am	2014-06-23 16:06:15.225426222 +0200
+@@ -19,7 +19,7 @@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+ 
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
+ 
+ EXTRA_DIST = misc/DISCLAIM
+ MOSTLYCLEANFILES = core *.stackdump
+diff -Naur gettext-0.19.1/gettext-tools/Makefile.in gettext-0.19.1.patch/gettext-tools/Makefile.in
+--- gettext-0.19.1/gettext-tools/Makefile.in	2014-06-10 07:42:48.000000000 +0200
++++ gettext-0.19.1.patch/gettext-tools/Makefile.in	2014-06-23 16:06:32.453461116 +0200
+@@ -1556,7 +1556,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
+ 
+ # Allow users to use "gnulib-tool --update".
+ 

packages/devel/glibc/package.mk

@@ -16,25 +16,25 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="eglibc"
+PKG_NAME="glibc"
-PKG_VERSION="2.19-25249"
+PKG_VERSION="2.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.eglibc.org/"
+PKG_SITE="http://www.gnu.org/software/libc/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="ftp://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="ccache:host autotools:host autoconf:host linux:host gcc:bootstrap"
-PKG_DEPENDS_INIT="eglibc"
+PKG_DEPENDS_INIT="glibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
-PKG_SHORTDESC="eglibc: The Embedded GNU C library"
+PKG_SHORTDESC="glibc: The GNU C library"
-PKG_LONGDESC="The Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) that is designed to work well on embedded systems. EGLIBC strives to be source and binary compatible with GLIBC. EGLIBC's goals include reduced footprint, configurable components, better support for cross-compilation and cross-testing. In contrast to what Ulrich Drepper makes out of GLIBC, in EGLIBC all patches assigned to the FSF will be considered regardless of individual or company affiliation and cooperation is encouraged, as well as communication, civility, and respect among developers."
+PKG_LONGDESC="The Glibc package contains the main C library. This library provides the basic routines for allocating memory, searching directories, opening and closing files, reading and writing files, string handling, pattern matching, arithmetic, and so on."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \
-                           --libexecdir=/usr/lib/eglibc \
+                           --libexecdir=/usr/lib/glibc \
                            --cache-file=config.cache \
                            --disable-profile \
                            --disable-sanity-checks \
@@ -57,15 +57,14 @@ if [ "$DEBUG" = yes ]; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-debug"
 else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-debug"
-  DEBUG_OPTIONS="  OPTION_EGLIBC_MEMUSAGE = n"
 fi
 
 NSS_CONF_DIR="$PKG_BUILD/nss"
 
-EGLIBC_EXCLUDE_BIN="catchsegv getconf iconv iconvconfig ldconfig lddlibc4"
+GLIBC_EXCLUDE_BIN="catchsegv gencat getconf iconv iconvconfig ldconfig lddlibc4"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof tzselect"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof tzselect"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN xtrace zdump zic"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN xtrace zdump zic"
 
 pre_build_target() {
   cd $PKG_BUILD
@@ -78,7 +77,7 @@ pre_configure_target() {
 # Fails to compile with GCC's link time optimization.
   strip_lto
 
-# eglibc dont support GOLD linker.
+# glibc dont support GOLD linker.
   strip_gold
 
 # Filter out some problematic *FLAGS
@@ -103,49 +102,6 @@ pre_configure_target() {
   export BUILD_CC=$HOST_CC
   export OBJDUMP_FOR_HOST=objdump
 
-# create configuration
-cat >option-groups.config <<EOF
-
-  OPTION_EGLIBC_ADVANCED_INET6 = n
-
-# needed for connman:
-  OPTION_EGLIBC_BACKTRACE = y
-
-  OPTION_EGLIBC_BIG_MACROS = n
-  OPTION_EGLIBC_BSD = n
-  OPTION_EGLIBC_CATGETS = n
-
-# libiconv replacement:
-  OPTION_EGLIBC_CHARSETS = y
-
-  OPTION_EGLIBC_DB_ALIASES = n
-  OPTION_EGLIBC_LOCALES = n
-
-# needed for example with glib and Python:
-  OPTION_EGLIBC_LOCALE_CODE = y
-
-# activeperl fails without libnsl. keep it enabled for now
-  OPTION_EGLIBC_NIS = y
-  OPTION_EGLIBC_NSSWITCH = y
-  OPTION_EGLIBC_RCMD = n
-
-# needed by eglibc byself (todo):
-  OPTION_EGLIBC_RTLD_DEBUG = y
-
-# needed for speed (optionally/todo)
-  OPTION_POSIX_REGEXP_GLIBC = y
-
-# needed for PAM and Mysql:
-  OPTION_EGLIBC_GETLOGIN = y
-
-# needed for systemd and dropbear:
-  OPTION_EGLIBC_UTMP = y
-  OPTION_EGLIBC_UTMPX = y
-
-# debugging options:
-  $DEBUG_OPTIONS
-EOF
-
 cat >config.cache <<EOF
 ac_cv_header_cpuid_h=yes
 libc_cv_forced_unwind=yes
@@ -166,16 +122,23 @@ post_makeinstall_target() {
   ln -sf $(basename $INSTALL/lib/ld-*.so) $INSTALL/lib/ld.so
 
 # cleanup
-  for i in $EGLIBC_EXCLUDE_BIN; do
+  for i in $GLIBC_EXCLUDE_BIN; do
     rm -rf $INSTALL/usr/bin/$i
   done
   rm -rf $INSTALL/usr/lib/audit
-  rm -rf $INSTALL/usr/lib/eglibc
+  rm -rf $INSTALL/usr/lib/glibc
   rm -rf $INSTALL/usr/lib/libc_pic
   rm -rf $INSTALL/usr/lib/*.o
   rm -rf $INSTALL/usr/lib/*.map
   rm -rf $INSTALL/var
 
+# remove locales and charmaps
+  rm -rf $INSTALL/usr/share/i18n/charmaps
+  rm -rf $INSTALL/usr/share/i18n/locales
+
+  mkdir -p $INSTALL/usr/share/i18n/locales
+    cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+
 # create default configs
   mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc

packages/devel/libffi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libffi"
-PKG_VERSION="3.0.11"
+PKG_VERSION="3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/libffi/patches/libffi-3.0.11-includedir.patch

@@ -1,22 +0,0 @@
-diff -Naur libffi-3.0.10/include/Makefile.am libffi-3.0.10.patch/include/Makefile.am
---- libffi-3.0.10/include/Makefile.am	2011-08-22 20:38:12.000000000 +0200
-+++ libffi-3.0.10.patch/include/Makefile.am	2011-11-04 09:26:38.587669344 +0100
-@@ -5,5 +5,5 @@
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/@PACKAGE_NAME@
- nodist_includes_HEADERS = ffi.h ffitarget.h
-diff -Naur libffi-3.0.10/libffi.pc.in libffi-3.0.10.patch/libffi.pc.in
---- libffi-3.0.10/libffi.pc.in	2011-08-22 20:38:12.000000000 +0200
-+++ libffi-3.0.10.patch/libffi.pc.in	2011-11-04 09:25:20.218682315 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@/@PACKAGE_NAME@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces

packages/devel/libffi/patches/libffi-Fix-installation-location-of-libffi.patch

@@ -0,0 +1,50 @@
+From 102c02de867bfe831b5366c89d66bcf170db962e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 7 Feb 2013 22:26:56 +0100
+Subject: [PATCH] Fix installation location of libffi
+
+The libffi is currently declared as toolexeclib_LTLIBRARIES. In many
+cases, toolexeclib libraries will be installed in /usr/lib, so it
+doesn't make any difference.
+
+However, with multilib toolchains, they get installed in a
+subdirectory of /usr/lib/. For example, with a Sourcery CodeBench
+PowerPC toolchain, if the e500mc multilib variant is used, the libffi
+library gets installed in /usr/lib/te500mc/. This is due to the
+following code in the configure script:
+
+  multi_os_directory=`$CC -print-multi-os-directory`
+  case $multi_os_directory in
+    .) ;; # Avoid trailing /.
+    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+  esac
+
+Once the library is installed in /usr/lib/te500mc/, nothing works
+because this installation location is inconsistent with the
+installation location declared in libffi.pc.
+
+So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use
+the more standard lib_LTLIBRARIES, which ensures that the libffi
+library is always installed in /usr/lib.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6f669ca..b60bcc1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -93,7 +93,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+ 
+ MAKEOVERRIDES=
+ 
+-toolexeclib_LTLIBRARIES = libffi.la
++lib_LTLIBRARIES = libffi.la
+ noinst_LTLIBRARIES = libffi_convenience.la
+ 
+ libffi_la_SOURCES = src/prep_cif.c src/types.c \
+-- 
+1.7.9.5
+

packages/devel/libffi/patches/libffi-includedir.patch

@@ -0,0 +1,23 @@
+diff -Naur libffi-3.1/include/Makefile.am libffi-3.1.patch/include/Makefile.am
+--- libffi-3.1/include/Makefile.am	2014-04-25 19:45:13.000000000 +0200
++++ libffi-3.1.patch/include/Makefile.am	2014-07-03 14:30:29.019161705 +0200
+@@ -5,5 +5,6 @@
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/@PACKAGE_NAME@
++
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+diff -Naur libffi-3.1/libffi.pc.in libffi-3.1.patch/libffi.pc.in
+--- libffi-3.1/libffi.pc.in	2014-04-25 19:45:13.000000000 +0200
++++ libffi-3.1.patch/libffi.pc.in	2014-07-03 14:30:56.047220839 +0200
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@/@PACKAGE_NAME@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces

packages/devel/mpc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mpc"
-PKG_VERSION="1.0.1"
+PKG_VERSION="1.0.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/graphics/Mesa/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="10.2.1"
+PKG_VERSION="10.2.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="2990b78"
+PKG_VERSION="1e7d3d9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/graphics/gpu-viv-bin-mx6q/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gpu-viv-bin-mx6q"
-PKG_VERSION="3.10.17-1.0.0"
+PKG_VERSION="3.10.17-1.0.0-1"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/graphics/libepoxy/package.mk

@@ -16,25 +16,20 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="glamor-egl"
+PKG_NAME="libepoxy"
-PKG_VERSION="0.6.0"
+PKG_VERSION="b2ae054"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://cgit.freedesktop.org/xorg/driver/glamor/"
+PKG_SITE="https://github.com/anholt/libepoxy"
-PKG_URL="http://cgit.freedesktop.org/xorg/driver/glamor/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain Mesa xorg-server libdrm"
+PKG_DEPENDS_TARGET="toolchain Mesa"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
-PKG_SHORTDESC="glamor-egl: OpenGL based 2D rendering acceleration library"
+PKG_SHORTDESC="libepoxy: a library for handling OpenGL function pointer management for you."
-PKG_LONGDESC="glamor-egl is a OpenGL based 2D rendering acceleration library"
+PKG_LONGDESC="Epoxy is a library for handling OpenGL function pointer management for you."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-glamor-gles2 --enable-xv --disable-glamor-dri3 --enable-glx-tls"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
-
-pre_configure_target() {
-  # glamor-egl fails to build with GOLD if we build with --enable-glx-tls
-  strip_gold
-}

packages/graphics/libpng/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.6.10"
+PKG_VERSION="1.6.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/lang/gcc/package.mk

@@ -25,7 +25,7 @@ PKG_SITE="http://gcc.gnu.org/"
 PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host"
 PKG_DEPENDS_TARGET="gcc:host"
-PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host eglibc"
+PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host glibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
 PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
@@ -52,6 +52,8 @@ BOOTSTRAP_CONFIGURE_OPTS="--host=$HOST_NAME \
                           --disable-libada \
                           --disable-libmudflap \
                           --disable-libatomic \
+                          --disable-libitm \
+                          --disable-libsanitizer \
                           --enable-gold \
                           --enable-ld=default \
                           --enable-plugin \
@@ -68,7 +70,8 @@ BOOTSTRAP_CONFIGURE_OPTS="--host=$HOST_NAME \
                           --disable-decimal-float \
                           $GCC_OPTS \
                           --disable-nls \
-                          --disable-cloog-version-check"
+                          --disable-cloog-version-check \
+                          --enable-checking=release"
 
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --with-sysroot=$SYSROOT_PREFIX \
@@ -96,14 +99,17 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --enable-cloog-backend=isl \
                          --enable-tls \
                          --enable-shared \
+                         --disable-static \
                          --enable-c99 \
                          --enable-long-long \
                          --enable-threads=posix \
                          --disable-libstdcxx-pch \
+                         --enable-libstdcxx-time \
                          --enable-clocale=gnu \
                          $GCC_OPTS \
                          --disable-nls \
-                         --disable-cloog-version-check"
+                         --disable-cloog-version-check \
+                         --enable-checking=release"
 
 pre_configure_bootstrap() {
   setup_toolchain host

packages/lang/gcc/patches/gcc-4.9-PR60902-1.patch

@@ -0,0 +1,100 @@
+From 0c5e8ed4943e302f6154e07368c0831e14c24187 Mon Sep 17 00:00:00 2001
+From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 13 May 2014 20:26:30 +0000
+Subject: [PATCH] 	PR tree-optimization/60902
+ 	* tree-ssa-threadedge.c
+ 	(record_temporary_equivalences_from_stmts_at_dest): Make sure to
+ 	invalidate outputs from statements that do not produce useful
+ 	outputs for threading.
+
+	PR tree-optimization/60902
+	* gcc.target/i386/pr60902.c: New test.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@210398 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/testsuite/gcc.target/i386/pr60902.c |   32 +++++++++++++++++++++++++++++++
+ gcc/tree-ssa-threadedge.c               |   29 +++++++++++++++++++++++++++-
+ 4 files changed, 79 insertions(+), 1 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/pr60902.c
+
+diff --git a/gcc/testsuite/gcc.target/i386/pr60902.c b/gcc/testsuite/gcc.target/i386/pr60902.c
+new file mode 100644
+index 0000000..b81dcd7
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/pr60902.c
+@@ -0,0 +1,32 @@
++/* { dg-do run } */
++/* { dg-options "-O2" } */
++extern void abort ();
++extern void exit (int);
++
++int x;
++
++foo()
++{
++  static int count;
++  count++;
++  if (count > 1)
++    abort ();
++}
++
++static inline int
++frob ()
++{
++  int a;
++  __asm__ ("mov %1, %0\n\t" : "=r" (a) : "m" (x));
++  x++;
++  return a;
++}
++
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 10 && frob () == 0; i++)
++    foo();
++  exit (0);
++}
+diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
+index c447b72..8a0103b 100644
+--- a/gcc/tree-ssa-threadedge.c
++++ b/gcc/tree-ssa-threadedge.c
+@@ -387,7 +387,34 @@ record_temporary_equivalences_from_stmts_at_dest (edge e,
+           && (gimple_code (stmt) != GIMPLE_CALL
+               || gimple_call_lhs (stmt) == NULL_TREE
+               || TREE_CODE (gimple_call_lhs (stmt)) != SSA_NAME))
+-	continue;
++	{
++	  /* STMT might still have DEFS and we need to invalidate any known
++	     equivalences for them.
++
++	     Consider if STMT is a GIMPLE_ASM with one or more outputs that
++	     feeds a conditional inside a loop.  We might derive an equivalence
++	     due to the conditional.  */
++	  tree op;
++	  ssa_op_iter iter;
++
++	  if (backedge_seen)
++	    FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_ALL_DEFS)
++	      {
++		/* This call only invalidates equivalences created by
++		   PHI nodes.  This is by design to keep the cost of
++		   of invalidation reasonable.  */
++		invalidate_equivalences (op, stack, src_map, dst_map);
++
++		/* However, conditionals can imply values for real
++		   operands as well.  And those won't be recorded in the
++		   maps.  In fact, those equivalences may be recorded totally
++		   outside the threading code.  We can just create a new
++		   temporary NULL equivalence here.  */
++	        record_temporary_equivalence (op, NULL_TREE, stack);
++	      }
++
++	  continue;
++	}
+ 
+       /* The result of __builtin_object_size depends on all the arguments
+ 	 of a phi node. Temporarily using only one edge produces invalid
+-- 
+1.7.1
+

packages/lang/gcc/patches/gcc-4.9-PR60902-2.patch

@@ -0,0 +1,30 @@
+From 4de76fa443ab107e4542bbdba242f0ed467cfecf Mon Sep 17 00:00:00 2001
+From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 13 May 2014 20:26:41 +0000
+Subject: [PATCH] 	PR tree-optimization/60902
+ 	* tree-ssa-threadedge.c
+ 	(record_temporary_equivalences_from_stmts_at_dest): Only iterate
+ 	over real defs when invalidating outputs from statements that do not
+ 	produce useful outputs for threading.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@210399 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/tree-ssa-threadedge.c |    2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
+index 8a0103b..7621348 100644
+--- a/gcc/tree-ssa-threadedge.c
++++ b/gcc/tree-ssa-threadedge.c
+@@ -398,7 +398,7 @@ record_temporary_equivalences_from_stmts_at_dest (edge e,
+ 	  ssa_op_iter iter;
+ 
+ 	  if (backedge_seen)
+-	    FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_ALL_DEFS)
++	    FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF)
+ 	      {
+ 		/* This call only invalidates equivalences created by
+ 		   PHI nodes.  This is by design to keep the cost of
+-- 
+1.7.1
+

packages/lang/llvm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.4.1"
+PKG_VERSION="3.4.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/tbs-linux-drivers/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="tbs-linux-drivers"
-PKG_VERSION="140113"
+PKG_VERSION="140707"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/linux-firmware/firmware-imx/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="firmware-imx"
-PKG_VERSION="3.5.7-1.0.0"
+PKG_VERSION="3.10.17-1.0.0"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="other"

packages/linux-firmware/misc-firmware/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="misc-firmware"
-PKG_VERSION="0.0.9"
+PKG_VERSION="0.0.11"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux-firmware/wlan-firmware/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.21"
+PKG_VERSION="0.0.23"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/package.mk

@@ -17,16 +17,8 @@
 ################################################################################
 
 PKG_NAME="linux"
-case "$LINUX" in
+PKG_VERSION="3.15.5"
-  imx6)
+PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
-    PKG_VERSION="cuboxi-592b2d9"
-    PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-    ;;
-  *)
-    PKG_VERSION="3.15"
-    PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
-    ;;
-esac
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"