Update of /cvsroot/pure-data/externals/gem2pdp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30576/gem2pdp

Modified Files: Tag: branch-v0-39-2-extended Makefile.in configure.ac gem2pdp.h pdp2gem.h pix_2pdp.h Added Files: Tag: branch-v0-39-2-extended config.guess config.sub Removed Files: Tag: branch-v0-39-2-extended configure pdp-light.h Log Message: added gem2pdp support from HEAD

--- pdp-light.h DELETED ---

Index: pdp2gem.h =================================================================== RCS file: /cvsroot/pure-data/externals/gem2pdp/pdp2gem.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** pdp2gem.h 11 Apr 2005 16:21:05 -0000 1.2 --- pdp2gem.h 27 Apr 2007 03:54:43 -0000 1.2.2.1 *************** *** 24,28 **** #include "Base/GemPixUtil.h" #include "Base/config.h" ! #include "pdp-light.h" #include <pthread.h>

--- 24,28 ---- #include "Base/GemPixUtil.h" #include "Base/config.h" ! #include "pdp.h" #include <pthread.h>

--- configure DELETED ---

Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/gem2pdp/Makefile.in,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** Makefile.in 17 Jun 2005 13:44:08 -0000 1.3 --- Makefile.in 27 Apr 2007 03:54:43 -0000 1.3.2.1 *************** *** 4,7 **** --- 4,10 ----

LIBS = @LIBS@ + LDFLAGS = @LDFLAGS@ + EXTENSION = @EXTENSION@ + GEM2PDP_VERSION = @GEM2PDP_VERSION@

*************** *** 10,42 **** # build flags

! GEM2PDP_INCLUDE = -I$(PD_DIR)/src -I. -I$(PDP_DIR)/include -I$(GEM_DIR)/src ! GEM2PDP_CPPFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wno-unused -Wno-parentheses -Wno-switch \ ! -DGEM2PDP_VERSION="$(GEM2PDP_VERSION)" -g ! PDP_PIDIP_CPPFLAGS = -O

! all: gem2pdp.pd_linux pdp2gem.pd_linux pix_2pdp.pd_linux

! pdp2gem.pd_linux: pdp2gem.o yuv.o ! rm -f pdp2gem.pd_linux ! gcc -export_dynamic -shared -o pdp2gem.pd_linux pdp2gem.o yuv.o $(LIBS)

! gem2pdp.pd_linux: gem2pdp.o yuv.o ! rm -f gem2pdp.pd_linux ! gcc -export_dynamic -shared -o gem2pdp.pd_linux gem2pdp.o yuv.o $(LIBS)

! pix_2pdp.pd_linux: pix_2pdp.o yuv.o ! rm -f pix_2pdp.pd_linux ! gcc -export_dynamic -shared -o pix_2pdp.pd_linux pix_2pdp.o yuv.o $(LIBS)

clean: rm -f *.o ! rm -f gem2pdp.pd_linux ! rm -f pdp2gem.pd_linux ! rm -f pix_2pdp.pd_linux

distro: clean all rm *.o ! strip --strip-unneeded gem2pdp.pd_linux cd .. && cp -rf gem2pdp /tmp/gem2pdp-$(GEM2PDP_VERSION) cd /tmp && tar vczf $(GEM2PDP_TARBALL) gem2pdp-$(GEM2PDP_VERSION) --- 13,47 ---- # build flags

! INCLUDES = @INCLUDES@ -I$(PD_DIR)/src -I. -I$(PDP_DIR)/include -I$(GEM_DIR)/src ! CFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wno-unused -Wno-parentheses -Wno-switch \ ! -DGEM2PDP_VERSION="$(GEM2PDP_VERSION)" -g @CFLAGS@ ! PDP_PIDIP_CFLAGS = -O

! export MACOSX_DEPLOYMENT_TARGET = 10.3

! all: gem2pdp.$(EXTENSION) pdp2gem.$(EXTENSION) pix_2pdp.$(EXTENSION)

! pdp2gem.$(EXTENSION): pdp2gem.o yuv.o ! rm -f pdp2gem.$(EXTENSION) ! gcc $(LDFLAGS) -o pdp2gem.$(EXTENSION) pdp2gem.o yuv.o $(LIBS)

! gem2pdp.$(EXTENSION): gem2pdp.o yuv.o ! rm -f gem2pdp.$(EXTENSION) ! gcc $(LDFLAGS) -o gem2pdp.$(EXTENSION) gem2pdp.o yuv.o $(LIBS) ! ! pix_2pdp.$(EXTENSION): pix_2pdp.o yuv.o ! rm -f pix_2pdp.$(EXTENSION) ! gcc $(LDFLAGS) -o pix_2pdp.$(EXTENSION) pix_2pdp.o yuv.o $(LIBS)

clean: rm -f *.o ! rm -f gem2pdp.$(EXTENSION) ! rm -f pdp2gem.$(EXTENSION) ! rm -f pix_2pdp.$(EXTENSION)

distro: clean all rm *.o ! strip --strip-unneeded gem2pdp.$(EXTENSION) cd .. && cp -rf gem2pdp /tmp/gem2pdp-$(GEM2PDP_VERSION) cd /tmp && tar vczf $(GEM2PDP_TARBALL) gem2pdp-$(GEM2PDP_VERSION) *************** *** 45,54 ****

.cpp.o: ! cat $(PDP_DIR)/include/pdp.h | grep -v m_pd > pdp-light.h ! g++ $(GEM2PDP_CPPFLAGS) $(GEM2PDP_INCLUDE) -o $*.o -c $*.cpp

.c.o: ! cat $(PDP_DIR)/include/pdp.h | grep -v m_pd > pdp-light.h ! gcc $(GEM2PDP_CPPFLAGS) $(GEM2PDP_INCLUDE) -o $*.o -c $*.c

install: --- 50,57 ----

.cpp.o: ! g++ $(CFLAGS) $(INCLUDES) -o $*.o -c $*.cpp

.c.o: ! gcc $(CFLAGS) $(INCLUDES) -o $*.o -c $*.c

install:

Index: pix_2pdp.h =================================================================== RCS file: /cvsroot/pure-data/externals/gem2pdp/pix_2pdp.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** pix_2pdp.h 22 Mar 2006 20:34:16 -0000 1.4 --- pix_2pdp.h 27 Apr 2007 03:54:43 -0000 1.4.2.1 *************** *** 16,20 **** #include "Base/GemPixObj.h"

! #include "pdp-light.h"

class GEM_EXTERN pix_2pdp : public GemPixObj --- 16,20 ---- #include "Base/GemPixObj.h"

! #include "pdp.h"

class GEM_EXTERN pix_2pdp : public GemPixObj

--- NEW FILE: config.guess --- #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002 Free Software Foundation, Inc.

timestamp='2002-01-02'

# This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software [...1280 lines suppressed...] /bin/universe = `(/bin/universe) 2>/dev/null` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` /bin/arch = `(/bin/arch) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`

UNAME_MACHINE = ${UNAME_MACHINE} UNAME_RELEASE = ${UNAME_RELEASE} UNAME_SYSTEM = ${UNAME_SYSTEM} UNAME_VERSION = ${UNAME_VERSION} EOF

exit 1

# Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End:

--- NEW FILE: config.sub --- #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002 Free Software Foundation, Inc.

timestamp='2002-01-02'

# This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the [...1401 lines suppressed...] -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; -vos*) vendor=stratus ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac

echo $basic_machine$os exit 0

# Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End:

Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/gem2pdp/configure.ac,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** configure.ac 17 Jun 2005 13:44:08 -0000 1.6 --- configure.ac 27 Apr 2007 03:54:43 -0000 1.6.2.1 *************** *** 91,96 **** fi

LIBS="$LIBS -lm" - CFLAGS="$CFLAGS -Wall"

AC_CONFIG_FILES([ --- 91,130 ---- fi

+ + AC_CANONICAL_HOST + case "$host" in + *-linux*) + EXTENSION=pd_linux + LDFLAGS="$LDFLAGS -export_dynamic -shared" + ;; + *-mingw*) + CFLAGS="$CFLAGS -mms-bitfields" + EXTENSION=dll + LDFLAGS="$LDFLAGS -shared" + ;; + *-darwin* | *-macos10*) + EXTENSION=pd_darwin + LDFLAGS="$LDFLAGS -bundle -undefined dynamic_lookup" + # Check for DarwinPorts and/or Fink on Mac OS X/Darwin + if test -d /sw ; then + # Fink + PATH="/sw/bin:/sw/sbin:$PATH" + INCLUDES="$INCLUDES -I/sw/include" + LIBS="$LIBS -L/sw/lib" + elif test -d /opt/local ; then + # DarwinPorts + PATH="/opt/local/bin:/opt/local/sbin:$PATH" + INCLUDES="$INCLUDES -I/opt/local/include" + LIBS="$LIBS -L/opt/local/lib" + fi + ;; + esac + + AC_SUBST(CFLAGS) + AC_SUBST(EXTENSION) + AC_SUBST(INCLUDES) + AC_SUBST(LDFLAGS) + LIBS="$LIBS -lm"

AC_CONFIG_FILES([

Index: gem2pdp.h =================================================================== RCS file: /cvsroot/pure-data/externals/gem2pdp/gem2pdp.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** gem2pdp.h 17 Jun 2005 13:44:08 -0000 1.2 --- gem2pdp.h 27 Apr 2007 03:54:43 -0000 1.2.2.1 *************** *** 13,17 **** #include "Base/GemBase.h" #include "Base/GemPixUtil.h" ! #include "pdp-light.h"

class GEM_EXTERN gem2pdp : public GemBase --- 13,17 ---- #include "Base/GemBase.h" #include "Base/GemPixUtil.h" ! #include "pdp.h"

class GEM_EXTERN gem2pdp : public GemBase