summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2019-10-01 22:36:55 +0100
committerJames Le Cuirot <chewi@gentoo.org>2019-10-01 22:52:25 +0100
commit0c21aa91719e657db66aaa170ae3e0be77e99e50 (patch)
tree5f301d4b9239410f67132d3584cb91340c705436 /media-libs/lib3ds/files
parentnet-misc/dropbox: bump to 81.4.195 w/ misc fixes (diff)
downloadgentoo-0c21aa91719e657db66aaa170ae3e0be77e99e50.tar.gz
gentoo-0c21aa91719e657db66aaa170ae3e0be77e99e50.tar.bz2
gentoo-0c21aa91719e657db66aaa170ae3e0be77e99e50.zip
media-libs/lib3ds: Drop old 1.x
This package almost certainly should have been slotted. It is only required by opencollada now and that expects 2.0.0_rc1. Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-libs/lib3ds/files')
-rw-r--r--media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch17
-rw-r--r--media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch94
2 files changed, 0 insertions, 111 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
deleted file mode 100644
index 1455660596bf..000000000000
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 41f658e5311b..000000000000
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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}