From 7d5fbd9f38358ff9a7aeba3d16f98abaf040ea1a Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 27 Jan 2008 10:43:35 +0000 Subject: [PATCH] * sndfile git-svn-id: trunk@10027 - --- .gitattributes | 14 +- .gitignore | 7 - packages/extra/sndfile/fpmake.pp | 17 - packages/{extra => }/sndfile/Makefile | 324 +++++++++++++++++- packages/{extra => }/sndfile/Makefile.fpc | 6 +- packages/{extra => }/sndfile/README | 0 .../sndfile => sndfile/examples}/sfplay.pp | 0 packages/sndfile/fpmake.pp | 29 ++ .../sndfile => sndfile/scripts}/testc.c | 0 .../{extra/sndfile => sndfile/src}/sndfile.pp | 0 10 files changed, 362 insertions(+), 35 deletions(-) delete mode 100644 packages/extra/sndfile/fpmake.pp rename packages/{extra => }/sndfile/Makefile (86%) rename packages/{extra => }/sndfile/Makefile.fpc (74%) rename packages/{extra => }/sndfile/README (100%) rename packages/{extra/sndfile => sndfile/examples}/sfplay.pp (100%) create mode 100644 packages/sndfile/fpmake.pp rename packages/{extra/sndfile => sndfile/scripts}/testc.c (100%) rename packages/{extra/sndfile => sndfile/src}/sndfile.pp (100%) diff --git a/.gitattributes b/.gitattributes index 317d585f4b..8d27b8a8cf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1770,13 +1770,6 @@ packages/extra/ptc/x11/x11modesi.inc svneol=native#text/x-pascal packages/extra/ptc/x11/x11windowdisplayd.inc svneol=native#text/x-pascal packages/extra/ptc/x11/x11windowdisplayi.inc svneol=native#text/x-pascal packages/extra/ptc/x11/xunikey.inc svneol=native#text/x-pascal -packages/extra/sndfile/Makefile svneol=native#text/plain -packages/extra/sndfile/Makefile.fpc svneol=native#text/plain -packages/extra/sndfile/README -text -packages/extra/sndfile/fpmake.pp svneol=native#text/plain -packages/extra/sndfile/sfplay.pp svneol=native#text/plain -packages/extra/sndfile/sndfile.pp svneol=native#text/plain -packages/extra/sndfile/testc.c -text packages/extra/univint/ABActions.pas svneol=native#text/plain packages/extra/univint/ABAddressBook.pas svneol=native#text/plain packages/extra/univint/ABGlobals.pas svneol=native#text/plain @@ -4253,6 +4246,13 @@ packages/sdl/src/sdl_net.pas svneol=native#text/plain packages/sdl/src/sdl_ttf.pas svneol=native#text/plain packages/sdl/src/sdlutils.pas svneol=native#text/plain packages/sdl/src/smpeg.pas svneol=native#text/plain +packages/sndfile/Makefile svneol=native#text/plain +packages/sndfile/Makefile.fpc svneol=native#text/plain +packages/sndfile/README svneol=native#text/plain +packages/sndfile/examples/sfplay.pp svneol=native#text/plain +packages/sndfile/fpmake.pp svneol=native#text/plain +packages/sndfile/scripts/testc.c svneol=native#text/plain +packages/sndfile/src/sndfile.pp svneol=native#text/plain packages/sqlite/Makefile svneol=native#text/plain packages/sqlite/Makefile.fpc svneol=native#text/plain packages/sqlite/fpmake.pp svneol=native#text/plain diff --git a/.gitignore b/.gitignore index 3d1e11944a..88eff5a291 100644 --- a/.gitignore +++ b/.gitignore @@ -777,13 +777,6 @@ packages/extra/ptc/*.s packages/extra/ptc/.gdbinit packages/extra/ptc/fpcmade.* packages/extra/ptc/units -packages/extra/sndfile/*.bak -packages/extra/sndfile/*.exe -packages/extra/sndfile/*.o -packages/extra/sndfile/*.ppu -packages/extra/sndfile/*.s -packages/extra/sndfile/fpcmade.* -packages/extra/sndfile/units packages/extra/units packages/extra/utmp/*.bak packages/extra/utmp/*.exe diff --git a/packages/extra/sndfile/fpmake.pp b/packages/extra/sndfile/fpmake.pp deleted file mode 100644 index d4b6178682..0000000000 --- a/packages/extra/sndfile/fpmake.pp +++ /dev/null @@ -1,17 +0,0 @@ -{$mode objfpc}{$H+} -program fpmake; - -uses fpmkunit; - -Var - T : TTarget; - -begin - With Installer do - begin - { Base packages } - {$i fpmake.inc} - Run; - end; -end. - diff --git a/packages/extra/sndfile/Makefile b/packages/sndfile/Makefile similarity index 86% rename from packages/extra/sndfile/Makefile rename to packages/sndfile/Makefile index f440737304..251f826f73 100644 --- a/packages/extra/sndfile/Makefile +++ b/packages/sndfile/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded @@ -98,7 +98,7 @@ endif endif export ECHO endif -override DEFAULT_FPCDIR=../../.. +override DEFAULT_FPCDIR=../.. ifndef FPC ifdef PP FPC=$(PP) @@ -720,6 +720,324 @@ ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_EXAMPLES+=sfplay endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1844,7 +2162,7 @@ endif endif endif .PHONY: fpc_units -ifneq ($(TARGET_UNITS),) +ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) override ALLTARGET+=fpc_units override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) diff --git a/packages/extra/sndfile/Makefile.fpc b/packages/sndfile/Makefile.fpc similarity index 74% rename from packages/extra/sndfile/Makefile.fpc rename to packages/sndfile/Makefile.fpc index 99db04d40f..09627a68f2 100644 --- a/packages/extra/sndfile/Makefile.fpc +++ b/packages/sndfile/Makefile.fpc @@ -18,7 +18,11 @@ libc=y fpcpackage=y [default] -fpcdir=../../.. +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests examples [rules] .NOTPARALLEL: diff --git a/packages/extra/sndfile/README b/packages/sndfile/README similarity index 100% rename from packages/extra/sndfile/README rename to packages/sndfile/README diff --git a/packages/extra/sndfile/sfplay.pp b/packages/sndfile/examples/sfplay.pp similarity index 100% rename from packages/extra/sndfile/sfplay.pp rename to packages/sndfile/examples/sfplay.pp diff --git a/packages/sndfile/fpmake.pp b/packages/sndfile/fpmake.pp new file mode 100644 index 0000000000..1120138674 --- /dev/null +++ b/packages/sndfile/fpmake.pp @@ -0,0 +1,29 @@ +{$ifndef ALLPACKAGES} +{$mode objfpc}{$H+} +program fpmake; + +uses fpmkunit; + +Var + P : TPackage; + T : TTarget; +begin + With Installer do + begin +{$endif ALLPACKAGES} + + P:=AddPackage('sndfile'); +{$ifdef ALLPACKAGES} + P.Directory:='sndfile'; +{$endif ALLPACKAGES} + P.Version:='2.0.0'; + P.SourcePath.Add('src'); +// P.Dependencies.Add('x11'); + + T:=P.Targets.AddUnit('sndfile.pp'); + +{$ifndef ALLPACKAGES} + Run; + end; +end. +{$endif ALLPACKAGES} diff --git a/packages/extra/sndfile/testc.c b/packages/sndfile/scripts/testc.c similarity index 100% rename from packages/extra/sndfile/testc.c rename to packages/sndfile/scripts/testc.c diff --git a/packages/extra/sndfile/sndfile.pp b/packages/sndfile/src/sndfile.pp similarity index 100% rename from packages/extra/sndfile/sndfile.pp rename to packages/sndfile/src/sndfile.pp