reinit the tree, so we can have metadata

4 files changed, 212 insertions, 0 deletions

diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
new file mode 100644
index 000000000000..1455660596bf
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
@@ -0,0 +1,17 @@
+diff -Naur lib3ds-1.3.0.orig/lib3ds/mesh.c lib3ds-1.3.0/lib3ds/mesh.c
+--- lib3ds-1.3.0.orig/lib3ds/mesh.c	2007-06-20 19:04:08.000000000 +0200
++++ lib3ds-1.3.0/lib3ds/mesh.c	2010-09-14 06:34:39.987807911 +0200
+@@ -87,8 +87,11 @@
+             faces=lib3ds_io_read_word(io);
+             for (i=0; i<faces; ++i) {
+               index=lib3ds_io_read_word(io);
+-              ASSERT(index<mesh->faces);
+-              strcpy(mesh->faceL[index].material, name);
++              if (index<mesh->faces) {
++                strncpy(mesh->faceL[index].material, name, 64);
++              } else {
++                // TODO warning
++              }
+             }
+           }
+           break;
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
new file mode 100644
index 000000000000..41f658e5311b
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
@@ -0,0 +1,94 @@
+diff -uNr lib3ds-1.2.0.orig/lib3ds-config.in lib3ds-1.2.0/lib3ds-config.in
+--- lib3ds-1.2.0.orig/lib3ds-config.in	2000-05-23 14:13:08.000000000 +0200
++++ lib3ds-1.2.0/lib3ds-config.in	2007-10-21 06:37:48.000000000 +0200
+@@ -1,9 +1,5 @@
+ #!/bin/sh
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-exec_prefix_set=no
+-
+ usage()
+ {
+     cat <<EOF
+@@ -22,6 +18,8 @@
+ 	usage 1 1>&2
+ fi
+ 
++PKG_CONFIG_ARGS=
++
+ while test $# -gt 0; do
+   case "$1" in
+   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+@@ -30,23 +28,23 @@
+ 
+   case $1 in
+     --prefix=*)
+-      prefix=$optarg
++      PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg"
+       if test $exec_prefix_set = no ; then
+-        exec_prefix=$optarg
++        PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
+       fi
+       ;;
+     --prefix)
+       echo_prefix=yes
+       ;;
+     --exec-prefix=*)
+-      exec_prefix=$optarg
++      PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
+       exec_prefix_set=yes
+       ;;
+     --exec-prefix)
+       echo_exec_prefix=yes
+       ;;
+     --version)
+-      echo @LIB3DS_VERSION@
++      pkg-config --modversion lib3ds
+       ;;
+     --cflags)
+       echo_cflags=yes
+@@ -62,23 +60,18 @@
+ done
+ 
+ if test "$echo_prefix" = "yes"; then
+-	echo $prefix
++  pkg-config $PKG_CONFIG_ARGS --variable=prefix lib3ds
+ fi
+ 
+ if test "$echo_exec_prefix" = "yes"; then
+-	echo $exec_prefix
++  pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix lib3ds
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      if test @includedir@ != /usr/include ; then
+-            echo -I@includedir@
+-      fi
++  pkg-config $PKG_CONFIG_ARGS --cflags lib3ds
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      if test @libdir@ != /usr/lib ; then
+-            my_linker_flags="-L@libdir@"
+-      fi
+-      echo ${my_linker_flags} -l3ds
+-fi      
++  pkg-config $PKG_CONFIG_ARGS --libs lib3ds
++fi
+ 
+diff -uNr lib3ds-1.2.0.orig/lib3ds.pc.in lib3ds-1.2.0/lib3ds.pc.in
+--- lib3ds-1.2.0.orig/lib3ds.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ lib3ds-1.2.0/lib3ds.pc.in	2007-10-21 06:23:53.000000000 +0200
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: lib3ds
++Description: lib3ds
++Version: @VERSION@
++Requires:
++Libs: -L${libdir} -l3ds -lm
++Cflags: -I${includedir}
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
new file mode 100644
index 000000000000..af9040883c10
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
@@ -0,0 +1,45 @@
+commit 562d1412a705b6667bc9fa594133366fb7e787ab
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 26 20:49:44 2013 +0200
+
+    avoid autoreconf
+
+diff --git a/examples/3ds2obj/Makefile.in b/examples/3ds2obj/Makefile.in
+index 1b5b1fe..d2fda8a 100644
+--- a/examples/3ds2obj/Makefile.in
++++ b/examples/3ds2obj/Makefile.in
+@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/src
+ 3ds2obj_SOURCES = 3ds2obj.c
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la -lm
+ EXTRA_DIST = 3ds2obj.vcproj
+ all: all-am
+ 
+diff --git a/examples/3dsdump/Makefile.in b/examples/3dsdump/Makefile.in
+index 4c915cc..f9f7bba 100644
+--- a/examples/3dsdump/Makefile.in
++++ b/examples/3dsdump/Makefile.in
+@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/src
+ 3dsdump_SOURCES = 3dsdump.c
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la -lm
+ EXTRA_DIST = 3dsdump.vcproj
+ all: all-am
+ 
+diff --git a/examples/cube/Makefile.in b/examples/cube/Makefile.in
+index 76b7946..1c4b5b6 100644
+--- a/examples/cube/Makefile.in
++++ b/examples/cube/Makefile.in
+@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/src 
+ cube_SOURCES = cube.c
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la -lm
+ EXTRA_DIST = cube.vcproj cube.tga 
+ all: all-am
+ 
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
new file mode 100644
index 000000000000..b9001af2993a
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
@@ -0,0 +1,56 @@
+commit 158cf6f8deaac69eba0c5941f809469cc3eefb43
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 26 20:49:01 2013 +0200
+
+    fix underlinking
+
+diff --git a/configure.in b/configure.in
+index 7bf17c2..fa5bd3f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -16,6 +16,8 @@ AM_INIT_AUTOMAKE(lib3ds, $LIB3DS_VERSION)
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
++AC_CHECK_LIBM
++
+ AC_OUTPUT([ \
+   lib3ds-config \
+   Makefile \
+diff --git a/examples/3ds2obj/Makefile.am b/examples/3ds2obj/Makefile.am
+index 8213225..4214675 100644
+--- a/examples/3ds2obj/Makefile.am
++++ b/examples/3ds2obj/Makefile.am
+@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
+ bin_PROGRAMS = 3ds2obj
+ 3ds2obj_SOURCES = 3ds2obj.c
+  
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
+ 
+ EXTRA_DIST = 3ds2obj.vcproj
+diff --git a/examples/3dsdump/Makefile.am b/examples/3dsdump/Makefile.am
+index 98ec5d1..ef19b04 100644
+--- a/examples/3dsdump/Makefile.am
++++ b/examples/3dsdump/Makefile.am
+@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
+ bin_PROGRAMS = 3dsdump
+ 3dsdump_SOURCES = 3dsdump.c
+  
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
+ 
+ EXTRA_DIST = 3dsdump.vcproj
+diff --git a/examples/cube/Makefile.am b/examples/cube/Makefile.am
+index c79c0ee..539813d 100644
+--- a/examples/cube/Makefile.am
++++ b/examples/cube/Makefile.am
+@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src
+ bin_PROGRAMS = cube
+ cube_SOURCES = cube.c
+  
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
+ 
+ EXTRA_DIST = cube.vcproj cube.tga 
+