From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch | 17 ++++ .../lib3ds/files/lib3ds-1.3.0-pkgconfig.patch | 94 ++++++++++++++++++++++ .../lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch | 17 ---- .../lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch | 94 ---------------------- .../files/lib3ds-2.0.0_rc1-underlinking.patch | 56 ------------- 5 files changed, 111 insertions(+), 167 deletions(-) create mode 100644 media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch create mode 100644 media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch delete mode 100644 media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch delete mode 100644 media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch delete mode 100644 media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch (limited to 'media-libs/lib3ds/files') diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch new file mode 100644 index 000000000000..1455660596bf --- /dev/null +++ b/media-libs/lib3ds/files/lib3ds-1.3.0-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; ifaces); +- strcpy(mesh->faceL[index].material, name); ++ if (indexfaces) { ++ strncpy(mesh->faceL[index].material, name, 64); ++ } else { ++ // TODO warning ++ } + } + } + break; diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch new file mode 100644 index 000000000000..41f658e5311b --- /dev/null +++ b/media-libs/lib3ds/files/lib3ds-1.3.0-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 <&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-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; ifaces); -- strcpy(mesh->faceL[index].material, name); -+ if (indexfaces) { -+ 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 <&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.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch deleted file mode 100644 index b9001af2993a..000000000000 --- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 158cf6f8deaac69eba0c5941f809469cc3eefb43 -Author: hasufell -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 - -- cgit v1.2.3