Date: Thu, 21 Sep 2006 02:07:22 -0400 From: Diane Bruce <db@db.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: stas@FreeBSD.org, steve@energistic.com Subject: ports/103448: [PATCH] devel/pwlib: [pwlib links against old SDL11] Message-ID: <E1GQHiU-000ByL-C8@diana.db.net> Resent-Message-ID: <200609210610.k8L6AMcw030763@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103448 >Category: ports >Synopsis: [PATCH] devel/pwlib: [pwlib links against old SDL11] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 21 06:10:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Diane Bruce >Release: FreeBSD 4.11-RELEASE-p9 i386 >Organization: none >Environment: System: FreeBSD heceta.db.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Tue May 17 16:07:52 EDT 2005 >Description: [DESCRIBE CHANGES] pwlib is hardcoded by upstream vendor to link against our old SDL11 libs. This is now obviously wrong and should also be fixed upstream. Added file(s): - files/patch-include_ptclib_vsdl.h - files/patch-src_ptclib_vsdl.cxx Port maintainer (steve@energistic.com) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- pwlib-1.10.1_2,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/pwlib/files/patch-configureac /usr/home/db/pwlib/files/patch-configureac --- /usr/ports/devel/pwlib/files/patch-configureac Wed Sep 20 23:25:42 2006 +++ /usr/home/db/pwlib/files/patch-configureac Thu Sep 21 01:33:38 2006 @@ -1,5 +1,5 @@ ---- configure.ac.orig Wed Feb 22 12:53:28 2006 -+++ configure.ac Sun May 7 14:19:18 2006 +--- configure.ac.orig Wed Feb 22 06:53:28 2006 ++++ configure.ac Thu Sep 21 01:33:15 2006 @@ -136,7 +136,7 @@ x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86 ;; @@ -116,7 +116,7 @@ else dnl SDL checks if test "${SDLLIB:-unset}" = "unset" ; then -@@ -1501,9 +1502,9 @@ +@@ -1501,11 +1502,11 @@ AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext) fi @@ -126,8 +126,11 @@ - AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1) + AC_CHECK_HEADER(SDL/SDL.h, HAS_SDL=1) if test "${HAS_SDL:-unset}" != "unset" ; then - SDLLIB=SDL-1.1 +- SDLLIB=SDL-1.1 ++ SDLLIB=SDL fi + fi + @@ -1527,7 +1528,7 @@ dnl ######################################################################## dnl check for video capture support. diff -ruN --exclude=CVS /usr/ports/devel/pwlib/files/patch-include_ptclib_vsdl.h /usr/home/db/pwlib/files/patch-include_ptclib_vsdl.h --- /usr/ports/devel/pwlib/files/patch-include_ptclib_vsdl.h Wed Dec 31 19:00:00 1969 +++ /usr/home/db/pwlib/files/patch-include_ptclib_vsdl.h Thu Sep 21 00:52:43 2006 @@ -0,0 +1,14 @@ +--- include/ptclib/vsdl.h.orig Thu Sep 21 00:49:29 2006 ++++ include/ptclib/vsdl.h Thu Sep 21 00:49:53 2006 +@@ -98,11 +98,7 @@ + #if P_SDL + + #include <ptlib.h> +-#if defined(P_FREEBSD) +-#include <SDL11/SDL.h> +-#else + #include <SDL/SDL.h> +-#endif + + #undef main + diff -ruN --exclude=CVS /usr/ports/devel/pwlib/files/patch-src_ptclib_vsdl.cxx /usr/home/db/pwlib/files/patch-src_ptclib_vsdl.cxx --- /usr/ports/devel/pwlib/files/patch-src_ptclib_vsdl.cxx Wed Dec 31 19:00:00 1969 +++ /usr/home/db/pwlib/files/patch-src_ptclib_vsdl.cxx Thu Sep 21 00:51:51 2006 @@ -0,0 +1,14 @@ +--- src/ptclib/vsdl.cxx.orig Thu Sep 21 00:50:56 2006 ++++ src/ptclib/vsdl.cxx Thu Sep 21 00:51:11 2006 +@@ -102,11 +102,7 @@ + + extern "C" { + +-#if defined(P_FREEBSD) +-#include <SDL11/SDL.h> +-#else + #include <SDL/SDL.h> +-#endif + + }; + --- pwlib-1.10.1_2,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1GQHiU-000ByL-C8>