Attachment 597228 Details for Bug 787713 – Patch against *-10

[patch] Patch against *-10

FreeSolid-misc.patch (text/plain), 2.19 KB, created by Ralf Corsepius on 2012-07-10 07:29:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Corsepius

Created: 2012-07-10 07:29:26 UTC

Size: 2.19 KB

patch

obsolete

>diff --git a/FreeSOLID.pc.in b/FreeSOLID.pc.in
>index bd0adc7..c04ef63 100644
>--- a/FreeSOLID.pc.in
>+++ b/FreeSOLID.pc.in
>@@ -5,6 +5,6 @@ includedir=@includedir@
> Name: Free Solid
> Description: 3D collision detection C++ library
> Version: @VERSION@
>-Libs: -L${libdir} -lfreesolid
>-Cflags: -I${includedir} -I/usr/include/freesolid
>-
>+# Requires: qhull
>+Libs: -L${libdir} -lFreeSOLID @QHULL_LIBS@
>+Cflags: -I${includedir} -I${includedir}/FreeSOLID
>diff --git a/Makefile.am b/Makefile.am
>index 27a736c..2a817bf 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -1,8 +1,24 @@
> ACLOCAL_AMFLAGS = -I m4
> SUBDIRS = libmoto libbroad libsolid sample doc
> 
>-EXTRA_DIST = include FreeSOLID.pc.in
>+EXTRA_DIST = FreeSOLID.pc.in
> bin_SCRIPTS = freesolid-config
> 
> pkgconfigdir         = $(libdir)/pkgconfig
>-dist_pkgconfig_DATA  = FreeSOLID.pc
>+nodist_pkgconfig_DATA  = FreeSOLID.pc
>+
>+FreeSOLID_3Ddir = $(includedir)/FreeSOLID/3D
>+FreeSOLID_3D_HEADERS =
>+FreeSOLID_3D_HEADERS += include/3D/Basic.h
>+FreeSOLID_3D_HEADERS += include/3D/Matrix.h
>+FreeSOLID_3D_HEADERS += include/3D/Point.h
>+FreeSOLID_3D_HEADERS += include/3D/Quaternion.h
>+FreeSOLID_3D_HEADERS += include/3D/Tuple3.h
>+FreeSOLID_3D_HEADERS += include/3D/Tuple4.h
>+FreeSOLID_3D_HEADERS += include/3D/Vector.h
>+
>+FreeSOLID_SOLIDdir = $(includedir)/FreeSOLID/SOLID
>+FreeSOLID_SOLID_HEADERS =
>+FreeSOLID_SOLID_HEADERS += include/SOLID/solid.h
>+FreeSOLID_SOLID_HEADERS += include/SOLID/broad.h
>+FreeSOLID_SOLID_HEADERS += include/SOLID/types.h
>diff --git a/freesolid-config.in b/freesolid-config.in
>index 91a5579..7bad5f3 100644
>--- a/freesolid-config.in
>+++ b/freesolid-config.in
>@@ -5,8 +5,7 @@ exec_prefix=@exec_prefix@
> exec_prefix_set=no
> 
> usage="\
>-Usage: freesolid-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]
>-On Fedora, changes to prefix and exec-prefix are silently ignored"
>+Usage: freesolid-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
> 
> if test $# -eq 0; then
>       echo "${usage}" 1>&2
>@@ -37,7 +36,7 @@ while test $# -gt 0; do
>       echo $exec_prefix
>       ;;
>     --version)
>-      pkg-config --version FreeSOLID
>+      pkg-config --modversion FreeSOLID
>       ;;
>     --cflags)
>       pkg-config --cflags FreeSOLID

Actions: View | Diff

Attachments on bug 787713: 571351 | 571691 | 571692 | 596979 | 596980 | 596981 | 597182 | 597228 | 597255 | 597316 | 597317 | 597318 | 597320 | 597414 | 597429