reinit the tree, so we can have metadata

2 files changed, 56 insertions, 0 deletions

diff --git a/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
new file mode 100644
index 000000000000..4094c61ba432
--- /dev/null
+++ b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
@@ -0,0 +1,23 @@
+gcc-6 is more strict WRT narrowing:
+error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { } [-Wnarrowing]
+
+https://bugs.gentoo.org/594912
+diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
+index 6bc8e86..5414ae3 100644
+--- a/audio/hufftable.cpp
++++ b/audio/hufftable.cpp
+@@ -552,3 +552,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, ~0u, ~0u, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+@@ -556,3 +556,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, ~0u, ~0u, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+@@ -566,3 +566,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14,~0u,  ~0u, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
diff --git a/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch b/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch
new file mode 100644
index 000000000000..66c246f08cca
--- /dev/null
+++ b/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch
@@ -0,0 +1,33 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Oct  7 15:10:46 UTC 2013
+Subject: fix smpeg2-config.in
+
+SDL_CONFIG is now SDL2_CONFIG in the new sdl2.m4
+
+--------------------------------------CUT---------------------------------------
+also
+
+Only dump -L/-rpath if libdir is non-standard; cribbed from smpeg patches
+
+--- smpeg-2.0.0.orig/smpeg2-config.in
++++ smpeg-2.0.0/smpeg2-config.in
+@@ -42,15 +42,17 @@
+       if test @includedir@ != /usr/include ; then
+         includes=-I@includedir@
+       fi
+-      echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags`
++      echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags`
+       ;;
+     --libs)
++      if [ "@libdir@" != "/usr/lib" ]; then
+       if [ "`uname`" = "SunOS" ]; then
+         libdirs="-L@libdir@ -R@libdir@"
+       else
+         libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@"
+       fi
+-      echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
++      fi
++      echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs`
+       ;;
+     *)
+       echo "${usage}" 1>&2