Ticket #22642: playerstage2.diff

File playerstage2.diff, 5.7 KB (added by ryandesign (Ryan Carsten Schmidt), 14 years ago)

revised patch that is mostly complete

  • playerstage-player/files/patch-CMakeLists.txt

     
     1--- utils/playerjoy/CMakeLists.txt.orig 2009-07-13 21:48:56.000000000 -0500
     2+++ utils/playerjoy/CMakeLists.txt      2009-11-22 07:22:56.000000000 -0600
     3@@ -4,7 +4,7 @@
     4         MESSAGE (STATUS "playerjoy will not be built - termios and joystick are not supported under Windows")
     5     ELSE (PLAYER_OS_WIN)
     6         IF (BUILD_PLAYERCC)
     7-            INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${PROJECT_BINARY_DIR}/client_libs)
     8+            INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${PROJECT_BINARY_DIR}/client_libs @PREFIX@/include)
     9 
     10             LINK_DIRECTORIES (${PLAYERCC_EXTRA_LINK_DIRS})
     11             PLAYER_ADD_EXECUTABLE (playerjoy playerjoy.cc)
     12--- utils/playerprint/CMakeLists.txt.orig       2009-07-13 09:03:44.000000000 -0500
     13+++ utils/playerprint/CMakeLists.txt    2009-11-22 08:11:54.000000000 -0600
     14@@ -18,7 +18,7 @@
     15             INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/replace)
     16         ENDIF (NOT HAVE_GETTIMEOFDAY)
     17 
     18-        INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${PROJECT_BINARY_DIR}/client_libs)
     19+        INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${PROJECT_BINARY_DIR}/client_libs @PREFIX@/include)
     20 
     21         LINK_DIRECTORIES (${PLAYERCC_EXTRA_LINK_DIRS})
     22         PLAYER_ADD_EXECUTABLE (playerprint playerprint.cc ${getoptSrc} ${usleepSrc} ${gettimeofdaySrc})
     23--- utils/playerprop/CMakeLists.txt.orig        2009-07-13 09:03:44.000000000 -0500
     24+++ utils/playerprop/CMakeLists.txt     2009-11-22 08:21:09.000000000 -0600
     25@@ -8,7 +8,7 @@
     26             INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/replace)
     27             SET (playerreplaceLib playerreplace)
     28         ENDIF (NOT HAVE_GETOPT)
     29-        INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${PROJECT_BINARY_DIR}/client_libs)
     30+        INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${PROJECT_BINARY_DIR}/client_libs @PREFIX@/include)
     31 
     32         LINK_DIRECTORIES (${PLAYERCC_EXTRA_LINK_DIRS})
     33         PLAYER_ADD_EXECUTABLE (playerprop playerprop.cpp ${getoptSrc})

  • playerstage-player/Portfile 

    Property changes on: playerstage-player/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native
     
    11# $Id$
     2
    23PortSystem        1.0
     4PortGroup         cmake 1.0
     5
    36name              playerstage-player
    4 version           2.0.4
    5 revision          2
     7version           3.0.0
    68categories        science
    79platforms         darwin
    810maintainers       ai.sri.com:vincent
    … …  
    1820master_sites      sourceforge:playerstage
    1921
    2022distname player-${version}
    21 use_bzip2 yes
    22 checksums sha1 96ae46abe9a81cab045b2a9ae6479a44fc6f2ac2
    2323
    24 worksrcdir player-${version}
     24checksums               md5     5beee8655754559d5b80d9fcfbd3dd69 \
     25                        sha1    5f24d7cd0565f98bf7a2615694304cf90e8fb679 \
     26                        rmd160  3a07213b51e8cc9ccd68a75c539a0fb9056b5127
     27
     28# Some of the utils can't find the boost headers...
     29patchfiles              patch-CMakeLists.txt
     30post-patch {
     31    reinplace "s|@PREFIX@|${prefix}|g" \
     32        ${worksrcpath}/utils/playerjoy/CMakeLists.txt \
     33        ${worksrcpath}/utils/playerprint/CMakeLists.txt \
     34        ${worksrcpath}/utils/playerprop/CMakeLists.txt
     35}
    2536
    2637depends_build   port:libtool port:pkgconfig
     38
    2739depends_lib     port:gtk2 \
    2840                port:jpeg \
    2941                port:libpng \
    … …  
    3143                port:tiff \
    3244                port:boost \
    3345                port:gsl \
    34                 port:python25 \
    35                 port:swig-python
    36 
    37 configure.env   PYTHON=python2.5
    38 
    39 use_parallel_build no
     46                port:python26 \
     47                port:swig-python \
     48                port:swig-ruby

  • playerstage-stage/Portfile

     
    11# $Id$
     2
    23PortSystem        1.0
     4PortGroup         cmake 1.0
     5PortGroup         archcheck 1.0
     6
    37name              playerstage-stage
    4 version           2.0.3
     8version           3.2.2
    59categories        science
    610platforms         darwin
    711maintainers       ai.sri.com:vincent
    … …  
    1620homepage          http://playerstage.sourceforge.net
    1721master_sites      sourceforge:playerstage
    1822
    19 distname stage-${version}
    20 use_bzip2 yes
    21 checksums sha1 2595fa2b004cc81fcdd89d1630bffa55304c7522
     23distname                Stage-${version}-Source
     24
     25checksums               md5     ca93c7c9746354679829092640c49ec6 \
     26                        sha1    783e16c179c76a65b64ad352c500f8ef6f3f1f2c \
     27                        rmd160  c0143cbcb5365110f7990fee27c3537cdad3a433
     28
     29depends_build           port:pkgconfig \
     30                        port:fltk
     31
     32depends_lib             port:playerstage-player \
     33                        port:libtool \
     34                        port:libpng \
     35                        port:jpeg
    2236
    23 worksrcdir stage-${version}
     37archcheck.files         lib/libfltk.a \
     38                        lib/libplayercore.dylib \
     39                        lib/libltdl.dylib \
     40                        lib/libpng.dylib \
     41                        lib/libjpeg.dylib
    2442
    25 depends_lib port:playerstage-player
     43# fltk is 32-bit only.
     44universal_variant       no
     45if {${build_arch} == "x86_64"} {
     46    configure.build_arch i386
     47} elseif {${build_arch} == "ppc64"} {
     48    configure.build_arch ppc
     49}