Merged haikuports/haikuports into master

This commit is contained in:
humdinger
2014-01-07 17:10:26 +01:00
33 changed files with 1436 additions and 421 deletions

View File

@@ -0,0 +1,99 @@
SUMMARY="An open source compiler for Pascal and Object Pascal"
DESCRIPTION="
Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional Pascal compiler.\
It can target multiple processor architectures: Intel x86, AMD64/x86-64,\
PowerPC, PowerPC64, SPARC, and ARM. Supported operating systems include Linux,\
FreeBSD, Haiku, Mac OS X/iOS/Darwin, DOS, Win32, Win64, WinCE, OS/2, MorphOS,\
Nintendo GBA, Nintendo DS, and Nintendo Wii. Additionally, JVM, MIPS (big and\
little endian variants) and Motorola 68k architecture targets are available in\
the development versions."
HOMEPAGE="http://www.freespascal.org"
SRC_URI="http://sourceforge.net/projects/freepascal/files/Source/2.6.2/fpc-2.6.2.source.tar.gz/download"
CHECKSUM_MD5="d501bb766b728a50d3a38adbe195528e"
LICENSE="
GNU LGPL v3
GNU GPL v3
"
COPYRIGHT="1993-2013 by Florian Klaempfl"
REVISION="1"
DISABLE_SOURCE_PACKAGE=yes
ARCHITECTURES="x86 ?x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86 ?x86_64"
PROVIDES="
fpc$secondaryArchSuffix = $portVersion
cmd:fpc$secondaryArchSuffix = $portVersion
cmd:bin2obj$secondaryArchSuffix = $portVersion
cmd:fp$secondaryArchSuffix = $portVersion
cmd:fpcmake$secondaryArchSuffix = $portVersion
cmd:unitdiff$secondaryArchSuffix = $portVersion
cmd:chmcmd$secondaryArchSuffix = $portVersion
cmd:chmls$secondaryArchSuffix = $portVersion
cmd:data2inc$secondaryArchSuffix = $portVersion
cmd:delp$secondaryArchSuffix = $portVersion
cmd:fd2pascal$secondaryArchSuffix = $portVersion
cmd:fpclasschart$secondaryArchSuffix = $portVersion
cmd:fpcmkcfg$secondaryArchSuffix = $portVersion
cmd:fpcres$secondaryArchSuffix = $portVersion
cmd:fpcsubst$secondaryArchSuffix = $portVersion
cmd:fpdoc$secondaryArchSuffix = $portVersion
cmd:fppkg$secondaryArchSuffix = $portVersion
cmd:fprcp$secondaryArchSuffix = $portVersion
cmd:h2pas$secondaryArchSuffix = $portVersion
cmd:h2paspp$secondaryArchSuffix = $portVersion
cmd:instantfpc$secondaryArchSuffix = $portVersion
cmd:makeskel$secondaryArchSuffix = $portVersion
cmd:mkarmins$secondaryArchSuffix = $portVersion
cmd:mkx86ins$secondaryArchSuffix = $portVersion
cmd:plex$secondaryArchSuffix = $portVersion
cmd:postw32$secondaryArchSuffix = $portVersion
cmd:ppc386$secondaryArchSuffix = $portVersion
cmd:ppdep$secondaryArchSuffix = $portVersion
cmd:ppudump$secondaryArchSuffix = $portVersion
cmd:ppufiles$secondaryArchSuffix = $portVersion
cmd:ppumove$secondaryArchSuffix = $portVersion
cmd:ptop$secondaryArchSuffix = $portVersion
cmd:pyacc$secondaryArchSuffix = $portVersion
cmd:rmcvsdir$secondaryArchSuffix = $portVersion
cmd:rstconv$secondaryArchSuffix = $portVersion
cmd:unitdiff$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
fpc == 2.6.2_bin
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:tar
cmd:wget
cmd:fpc == 2.6.2_bin
"
SOURCE_DIR="fpc-2.6.2"
#Create the fpc-2.6.2-1-x86.hpkg
#Download the FreePascalCompiler from www.freepascal.org
#Extract the tarball and run ./install.sh
#Create a .PackageInfo where the compiler is installed
#Run package create -0 fpc-2.6.2-1-x86.hpkg
#Put it on the common folders
MESSAGE="This recipe requires an existing fpc-2.6.2_bin-1-x86.hpkg package"
BUILD()
{
fpcmake -Tall -r
make build
}
INSTALL()
{
make install INSTALL_PREFIX=$prefix
}

View File

@@ -0,0 +1,43 @@
SUMMARY="FreePascalCompiler binary"
DESCRIPTION="FreePascalCompiler binary"
HOMEPAGE="http://www.freepascal.org"
SRC_URI="ftp://freepascal.stack.nl/pub/fpc/dist/2.6.0/i386-haiku/fpc-2.6.0.i386-haiku.tar"
CHECKSUM_MD5="e45911a932ff8fdb4578dae2f96c19a1"
LICENSE="
GNU LGPL v3
GNU GPL v3
"
COPYRIGHT="1993-2013 by Florian Klaempfl"
REVISION="1"
DISABLE_SOURCE_PACKAGE=yes
BUILD_ACTIVATION_PHASE="INSTALL"
ARCHITECTURES="x86"
PROVIDES="
fpc = $portVersion
cmd:fpc = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
binutils
cmd:tar
"
SOURCE_DIR="fpc-2.6.0.i386-haiku"
BUILD()
{
echo "Please put as prefix: $prefix"
sh ./install.sh
}
INSTALL()
{
true
}

View File

@@ -1,7 +1,14 @@
SUMMARY="GMP - GNU Multiple Precision Arithmetic Library"
DESCRIPTION="
GMP - GNU Multiple Precision Arithmetic Library
"
The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
and floating point numbers. There are no practical limits to the precision \
except the ones implied by the available memory in the machine GMP runs on \
(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
64-bit machines). GMP has a rich set of functions, and the functions have a \
regular interface. The basic interface is for C but wrappers exist for other \
languages including Ada, C++, C#, OCaml, Perl, PHP, and Python. \
"
HOMEPAGE="http://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
CHECKSUM_MD5="485b1296e6287fa381e6015b19767989"
@@ -10,14 +17,18 @@ LICENSE="GNU GPL v3
COPYRIGHT="1991-2013 Free Software Foundation, Inc."
REVISION="1"
ARCHITECTURES="x86 x86_gcc2"
PROVIDES="cmd:gmp = $portVersion compat >= 5.1
lib:libgmp
lib:libgmp = 10
lib:libgmp = 10.1.1"
REQUIRES="haiku >= $haikuVersion"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1
lib:libgmp$secondaryArchSuffix = 10.1.1 compat >= 10
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
cmd:gcc
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:libtool
cmd:autoconf
cmd:automake
@@ -36,7 +47,7 @@ BUILD()
INSTALL()
{
make install
make install includedir=$includeDir includeexecdir=$includeDir
# prepare devel/lib
prepareInstalledDevelLibs libgmp
@@ -54,10 +65,10 @@ TEST()
# ----- devel package
PROVIDES_devel="
libgmp = $portVersion
devel:libgmp = 10.1.1 compat >= 0
gmp${secondaryArchSuffix}_devel = $portVersion
devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0
"
REQUIRES_devel="
libgmp == $portVersion base
gmp$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,91 @@
SUMMARY="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format"
DESCRIPTION="
DWARF is a widely used, standardized debugging data format. DWARF was \
originally designed along with Executable and Linkable Format (ELF), although \
it is independent of object file formats. The name is a medieval fantasy \
complement to ELF that has no official meaning, although the backronym \
'Debugging With Attributed Record Formats' was later proposed.
The DWARF Debugging Information Format is of interest to programmers working on \
compilers and debuggers (and anyone interested in reading or writing DWARF \
information). DWARF uses a data structure called a Debugging Information Entry \
(DIE) to represent each variable, type, procedure, etc. It was developed by a \
committee (known as the PLSIG at the time) starting around 1991. Starting \
around 1991 SGI developed the libdwarf and dwarfdump tools for internal use and \
as part of SGI IRIX developer tools. Since that time dwarfdump and libdwarf \
have been shipped (as an executable and archive respectively, not source) with \
every release of the SGI MIPS/IRIX C compiler. In 1994 (I think the correct \
year) SGI agreed to open-source libdwarf (and in 1999 to open-source dwarfdump) \
so anyone could use them.
libdwarf allows reading, creation and manipulation of dwarf data. dwarfdump \
(written in C) and dwarfdump2 (written in C++) do the same job, they let you \
dump out, in readable form, the DWARF2, DWARF3, or DWARF4 data from an object \
file, but dwarfdump2 does a better job in some respects.
This package includes dwarfdump2 and libdwarf, although the source package has \
been patched to make dwarfdump and dwarfgen haiku compatible as well.
"
HOMEPAGE="http://www.prevanders.net/dwarf.html"
SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz"
CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d"
LICENSE="
GNU GPL v2
GNU LGPL v2.1
"
COPYRIGHT="
2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved.
2007-2010 David Anderson. All Rights Reserved.
2007-2010 Sun Microsystems, Inc. All rights reserved
"
REVISION="1"
ARCHITECTURES="x86 x86_gcc2"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
SOURCE_DIR="dwarf-$portVersion"
PATCHES="libdwarf-20130729.patch"
PROVIDES="
lib:libdwarf$secondaryArchSuffix = $portVersion
cmd:dwarfdump = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libelf$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libelf$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
cd libdwarf
runConfigure ./configure --enable-shared
make
cd ../dwarfdump2
LDFLAGS="-L../libdwarf" ./configure $configureDirArgs
LIBRARY_PATH=$LIBRARY_PATH:%A/../libdwarf make
}
INSTALL()
{
cd libdwarf
make install bindir=$binDir libdir=$libDir incdir=$includeDir
cd ../dwarfdump2
make install mandir=$manDir
packageEntries devel $developDir
}
PROVIDES_devel="
libdwarf${secondaryArchSuffix}_devel = $portVersion
devel:libdwarf$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
lib:libdwarf$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,168 @@
diff -Naur dwarf-20130729/dwarfdump/Makefile.in dwarf-20130729-c89/dwarfdump/Makefile.in
--- dwarf-20130729/dwarfdump/Makefile.in 2013-02-02 19:13:55.031981568 +0000
+++ dwarf-20130729-c89/dwarfdump/Makefile.in 2014-01-06 11:16:30.116916224 +0000
@@ -154,9 +154,11 @@
# will work and leave sensible permissions on the resulting files.
# Some adjustment might be required, see README.
install: all
- $(INSTALL) dwarfdump $(bindir)/dwarfdump
- $(INSTALL) $(srcdir)/dwarfdump.conf $(libdir)/dwarfdump.conf
- $(INSTALL) $(srcdir)/dwarfdump.1 $(man1dir)/dwarfdump.1
+ install -m 0755 -d $(bindir)
+ install -m 0755 -d $(man1dir)
+ install -m 0755 dwarfdump $(bindir)
+ install -m 0755 dwarfdump.conf $(libdir)
+ install -m 0755 dwarfdump.1 $(man1dir)
uninstall:
-rm -f $(bindir)/dwarfdump
diff -Naur dwarf-20130729/dwarfdump/print_die.c dwarf-20130729-c89/dwarfdump/print_die.c
--- dwarf-20130729/dwarfdump/print_die.c 2013-02-06 20:48:07.024903680 +0000
+++ dwarf-20130729-c89/dwarfdump/print_die.c 2014-01-06 11:16:30.131596288 +0000
@@ -3380,6 +3380,7 @@
we have a serious botch. this FORM
defines the value as a .debug_info
global offset. */
+ int res = 0;
Dwarf_Off cuoff = 0;
Dwarf_Off culen = 0;
Dwarf_Off die_overall_offset = 0;
@@ -3399,7 +3400,7 @@
print_error(dbg,small_buf,DW_DLV_OK,0);
}
- int res = dwarf_die_CU_offset_range(die,&cuoff,
+ res = dwarf_die_CU_offset_range(die,&cuoff,
&culen,&err);
DWARF_CHECK_COUNT(tag_tree_result,1);
if (res != DW_DLV_OK) {
diff -Naur dwarf-20130729/dwarfdump2/dwarfdump.cc dwarf-20130729-c89/dwarfdump2/dwarfdump.cc
--- dwarf-20130729/dwarfdump2/dwarfdump.cc 2013-07-30 16:12:36.033292288 +0000
+++ dwarf-20130729-c89/dwarfdump2/dwarfdump.cc 2014-01-06 11:19:43.419168256 +0000
@@ -47,6 +47,9 @@
#include <vector>
#include <algorithm> // for sort
#include <iomanip>
+#if __GNUC__ == 2
+#include <streambuf.h>
+#endif
/* for 'open' */
#include <sys/types.h>
@@ -2413,7 +2416,11 @@
Compiler *pCompiler, Dwarf_Check_Categories category)
{
Dwarf_Check_Result result = pCompiler->results_[category];
+#if __GNUC__ == 2
+ cerr << std::setw(24) << ios::left << str <<
+#else
cerr << std::setw(24) << std::left << str <<
+#endif
IToDec(result.checks_,10) <<
" " <<
IToDec(result.errors_,10) << endl;
diff -Naur dwarf-20130729/dwarfdump2/Makefile.in dwarf-20130729-c89/dwarfdump2/Makefile.in
--- dwarf-20130729/dwarfdump2/Makefile.in 2013-02-02 19:16:44.038797312 +0000
+++ dwarf-20130729-c89/dwarfdump2/Makefile.in 2014-01-06 12:53:29.018350080 +0000
@@ -133,9 +133,11 @@
# will work and leave sensible permissions on the resulting files.
# Some adjustment might be required, see README.
install: all
- $(INSTALL) dwarfdump $(bindir)/dwarfdump
- $(INSTALL) $(srcdir)/dwarfdump.1 $(man1dir)/dwarfdump.1
- $(INSTALL) $(srcdir)/dwarfdump.conf $(libdir)/dwarfdump.conf
+ install -m 0755 -d $(bindir)
+ install -m 0755 -d $(man1dir)
+ install -m 0755 dwarfdump $(bindir)
+ install -m 0755 dwarfdump.conf $(libdir)
+ install -m 0755 dwarfdump.1 $(man1dir)
uninstall:
-rm -f $(bindir)/dwarfdump
diff -Naur dwarf-20130729/dwarfgen/createirepformfrombinary.cc dwarf-20130729-c89/dwarfgen/createirepformfrombinary.cc
--- dwarf-20130729/dwarfgen/createirepformfrombinary.cc 2013-02-01 16:20:06.020971520 +0000
+++ dwarf-20130729-c89/dwarfgen/createirepformfrombinary.cc 2014-01-06 11:16:30.163577856 +0000
@@ -28,7 +28,6 @@
#include <string.h> // For memset etc
#include <sys/stat.h> //open
#include <fcntl.h> //open
-#include "elf.h"
#include "gelf.h"
#include "strtabdata.h"
#include "dwarf.h"
diff -Naur dwarf-20130729/dwarfgen/createirepfrombinary.cc dwarf-20130729-c89/dwarfgen/createirepfrombinary.cc
--- dwarf-20130729/dwarfgen/createirepfrombinary.cc 2013-02-01 16:20:11.022282240 +0000
+++ dwarf-20130729-c89/dwarfgen/createirepfrombinary.cc 2014-01-06 11:16:30.171442176 +0000
@@ -30,7 +30,6 @@
#include <string.h> // For memset etc
#include <sys/stat.h> //open
#include <fcntl.h> //open
-#include "elf.h"
#include "gelf.h"
#include "strtabdata.h"
#include "dwarf.h"
diff -Naur dwarf-20130729/dwarfgen/dwarfgen.cc dwarf-20130729-c89/dwarfgen/dwarfgen.cc
--- dwarf-20130729/dwarfgen/dwarfgen.cc 2013-02-01 16:20:17.023330816 +0000
+++ dwarf-20130729-c89/dwarfgen/dwarfgen.cc 2014-01-06 11:16:30.179830784 +0000
@@ -56,8 +56,8 @@
#include <string.h> // For memset etc
#include <sys/stat.h> //open
#include <fcntl.h> //open
+#include <stdint.h>
#include "general.h"
-#include "elf.h"
#include "gelf.h"
#include "strtabdata.h"
#include "dwarf.h"
diff -Naur dwarf-20130729/dwarfgen/irepattrtodbg.cc dwarf-20130729-c89/dwarfgen/irepattrtodbg.cc
--- dwarf-20130729/dwarfgen/irepattrtodbg.cc 2013-02-01 16:20:21.021495808 +0000
+++ dwarf-20130729-c89/dwarfgen/irepattrtodbg.cc 2014-01-06 11:16:30.192937984 +0000
@@ -30,7 +30,6 @@
#include <sys/stat.h> //open
#include <fcntl.h> //open
#include "general.h"
-#include "elf.h"
#include "gelf.h"
#include "strtabdata.h"
#include "dwarf.h"
diff -Naur dwarf-20130729/dwarfgen/ireptodbg.cc dwarf-20130729-c89/dwarfgen/ireptodbg.cc
--- dwarf-20130729/dwarfgen/ireptodbg.cc 2013-02-01 16:20:26.022544384 +0000
+++ dwarf-20130729-c89/dwarfgen/ireptodbg.cc 2014-01-06 11:16:30.201064448 +0000
@@ -28,7 +28,6 @@
#include <string.h> // For memset etc
#include <sys/stat.h> //open
#include <fcntl.h> //open
-#include "elf.h"
#include "gelf.h"
#include "strtabdata.h"
#include "dwarf.h"
diff -Naur dwarf-20130729/libdwarf/gennames.c dwarf-20130729-c89/libdwarf/gennames.c
--- dwarf-20130729/libdwarf/gennames.c 2013-01-25 19:09:11.056885248 +0000
+++ dwarf-20130729-c89/libdwarf/gennames.c 2014-01-06 11:16:30.209715200 +0000
@@ -486,8 +486,8 @@
/* Process each line from 'dwarf.h' */
while (!feof(f_dwarf_in)) {
- errno = 0;
char *fgbad = fgets(line_in,sizeof(line_in),f_dwarf_in);
+ errno = 0;
if(!fgbad) {
if(feof(f_dwarf_in)) {
break;
diff -Naur dwarf-20130729/libdwarf/Makefile.in dwarf-20130729-c89/libdwarf/Makefile.in
--- dwarf-20130729/libdwarf/Makefile.in 2013-07-28 17:58:54.056885248 +0000
+++ dwarf-20130729-c89/libdwarf/Makefile.in 2014-01-06 11:16:30.217055232 +0000
@@ -213,8 +214,11 @@
rm -f dwarf_names_enum.h dwarf_names_new.h dwarf_names.c dwarf_names.h
install: all
- echo "No install provided, see comments in the README"
-
+ install -m 0755 -d $(incdir)
+ install -m 0755 -d $(libdir)
+ install -m 0755 libdwarf.h $(incdir)
+ install -m 0755 dwarf.h $(incdir)
+ install -m 0755 libdwarf.so $(libdir)
distclean: clean
rm -f config.status config.log config.cache config.h
rm -rf autom4te.cache

View File

@@ -1,24 +1,60 @@
DESCRIPTION="libelf - ELF object file access library"
SUMMARY="libelf - ELF object file access library"
DESCRIPTION="
Libelf lets you read, modify or create ELF files in an architecture-independent \
way. The library takes care of size and endian issues, e.g. you can process a \
file for SPARC processors on an Intel-based system. This library is a \
clean-room rewrite of the System V Release 4 library and is source code \
compatible with it.
"
HOMEPAGE="http://www.mr511.de/software/english.html"
SRC_URI="http://www.mr511.de/software/libelf-0.8.13.tar.gz"
CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac"
LICENSE="GNU LGPL v2"
COPYRIGHT="1995-2008 Michael Riepe"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
ARCHITECTURES="x86 x86_gcc2"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libelf-0.8.13.patch"
PROVIDES="
lib:libelf$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:autoreconf
cmd:make
"
BUILD()
{
cd libelf-0.8.13
libtoolize -fci
autoreconf
./configure --enable-gnu-names --prefix=$(finddir B_COMMON_DIRECTORY)
make
libtoolize -fci
autoreconf
runConfigure ./configure
make
}
INSTALL()
{
cd libelf-0.8.13
make install instroot=$DESTDIR
make install-compat instroot=$DESTDIR
make install
make install-compat
prepareInstalledDevelLib libelf
packageEntries devel $developDir
}
LICENSE="GNU LGPL v2"
COPYRIGHT="1995-2008 Michael Riepe"
PROVIDES_devel="
libelf${secondaryArchSuffix}_devel = $portVersion
devel:libelf$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
lib:libelf$secondaryArchSuffix == $portVersion base
"

View File

@@ -11,7 +11,7 @@ LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz"
CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882"
REVISION="6"
REVISION="7"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
PROVIDES="

View File

@@ -1771,3 +1771,79 @@ index dd4c55e..36576d1 100644
--
1.8.3.4
From 6746cfb5f706471d49f243a036589be7f6f0e226 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 22:24:23 +0100
Subject: Make sure the extraction of secondary arch works
Sometimes the string didn't end with a newline, leading to misdetection
of the secondary arch. Should fix use of CMake to build hybrid packages.
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
index 36576d1..3d06566 100644
--- a/Modules/Platform/Haiku.cmake
+++ b/Modules/Platform/Haiku.cmake
@@ -39,7 +39,7 @@ execute_process(
RESULT_VARIABLE _HAIKU_SEARCH_DIRS_FOUND
OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/[:^\n]" _dummy "${_HAIKU_SEARCH_DIRS}")
+string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/[:\n]" _dummy "${_HAIKU_SEARCH_DIRS}\n")
set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
--
1.8.3.4
From 3f7e225897df9e71dee6745cca2ec4f1defd0298 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 22:46:37 +0100
Subject: Fix search directories for SDL image,mixer,ttf.
The path starting with "include" should probably be removed, but I fear
of breaking other platforms.
diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake
index 30d74ac..5685434 100644
--- a/Modules/FindSDL_image.cmake
+++ b/Modules/FindSDL_image.cmake
@@ -40,7 +40,7 @@ find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h
HINTS
ENV SDLIMAGEDIR
ENV SDLDIR
- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
+ PATH_SUFFIXES SDL include/SDL include/SDL12 include/SDL11 include
)
if(NOT SDL_IMAGE_LIBRARY AND SDLIMAGE_LIBRARY)
diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
index 8ca7cc3..80b7b60 100644
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@@ -40,7 +40,7 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
HINTS
ENV SDLMIXERDIR
ENV SDLDIR
- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
+ PATH_SUFFIXES SDL include/SDL include/SDL12 include/SDL11 include
)
if(NOT SDL_MIXER_LIBRARY AND SDLMIXER_LIBRARY)
diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake
index bb0ca91..91577d6 100644
--- a/Modules/FindSDL_ttf.cmake
+++ b/Modules/FindSDL_ttf.cmake
@@ -40,7 +40,7 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h
HINTS
ENV SDLTTFDIR
ENV SDLDIR
- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
+ PATH_SUFFIXES SDL include/SDL include/SDL12 include/SDL11 include
)
if(NOT SDL_TTF_LIBRARY AND SDLTTF_LIBRARY)
--
1.8.3.4

View File

@@ -0,0 +1,31 @@
From fc69e8dc4e2287cef93857a29d80b8930b90baa9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 23:14:13 +0100
Subject: Support thread renaming.
diff --git a/lib/CThreadHelper.cpp b/lib/CThreadHelper.cpp
index 3774c4b..b0aca56 100644
--- a/lib/CThreadHelper.cpp
+++ b/lib/CThreadHelper.cpp
@@ -3,6 +3,8 @@
#ifdef _WIN32
#include <windows.h>
+#elif defined(__HAIKU__)
+ #include <OS.h>
#elif !defined(__APPLE__)
#include <sys/prctl.h>
#endif
@@ -80,6 +82,8 @@ void setThreadName(const std::string &name)
//not supported
#endif
+#elif defined(__HAIKU__)
+ rename_thread(find_thread(NULL), name.c_str());
#elif defined(__linux__)
prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
#endif
--
1.8.3.4

View File

@@ -0,0 +1,77 @@
SUMMARY="VCMI is an open source engine for Heroes or Migh and Magic III"
DESCRIPTION="
We want to rewrite the entire H3 engine (VCMI is NOT another mod) giving it
new possibilities. Few years of intensive work resulted in creating application
with impressive amount of features.
You require the original game files to use this port
"
HOMEPAGE="http://vcmi.eu"
SRC_URI="http://download.vcmi.eu/vcmi-0.94.tar.gz"
CHECKSUM_MD5="faaf52b539c20455e198f58401eef645"
REVISION="1"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PATCHES="vcmi-0.94.patchset"
PROVIDES="
vcmi$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
lib:libSDL$secondaryArchSuffix
lib:libsdl_mixer$secondaryArchSuffix
lib:libsdl_image$secondaryArchSuffix
lib:libsdl_ttf$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libboost_program_options$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_thread$secondaryArchSuffix
lib:libboost_unit_test_framework$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libSDL$secondaryArchSuffix
devel:libsdl_mixer$secondaryArchSuffix
devel:libsdl_image$secondaryArchSuffix
devel:libsdl_ttf$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libboost_program_options$secondaryArchSuffix
devel:libboost_filesystem$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix
devel:libboost_thread$secondaryArchSuffix
devel:libboost_unit_test_framework$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:make
cmd:gcc$secondaryArchSuffix
cmd:as$secondaryArchSuffix
"
BUILD()
{
mkdir -p build
cd build
cmake ..
make $jobArgs
}
INSTALL()
{
make install
}
COPYRIGHT="2005-2013 VCMI Team"
LICENSE="GNU GPL v2"

View File

@@ -8,7 +8,7 @@ DESCRIPTION="
"
HOMEPAGE="http://synrc.com/client/chat/haiku/"
SRC_URI="git+https://github.com/devaspot/chat.git"
LICENSE="Attribution-NonCommercial 3.0 Unported"
LICENSE="MIT"
COPYRIGHT="2012 Maxim Sokhatsky"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86"

View File

@@ -1,334 +0,0 @@
Creative Commons Legal Code
Attribution-NonCommercial 3.0 Unported
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
DAMAGES RESULTING FROM ITS USE.
License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
CONDITIONS.
1. Definitions
a. "Adaptation" means a work based upon the Work, or upon the Work and
other pre-existing works, such as a translation, adaptation,
derivative work, arrangement of music or other alterations of a
literary or artistic work, or phonogram or performance and includes
cinematographic adaptations or any other form in which the Work may be
recast, transformed, or adapted including in any form recognizably
derived from the original, except that a work that constitutes a
Collection will not be considered an Adaptation for the purpose of
this License. For the avoidance of doubt, where the Work is a musical
work, performance or phonogram, the synchronization of the Work in
timed-relation with a moving image ("synching") will be considered an
Adaptation for the purpose of this License.
b. "Collection" means a collection of literary or artistic works, such as
encyclopedias and anthologies, or performances, phonograms or
broadcasts, or other works or subject matter other than works listed
in Section 1(f) below, which, by reason of the selection and
arrangement of their contents, constitute intellectual creations, in
which the Work is included in its entirety in unmodified form along
with one or more other contributions, each constituting separate and
independent works in themselves, which together are assembled into a
collective whole. A work that constitutes a Collection will not be
considered an Adaptation (as defined above) for the purposes of this
License.
c. "Distribute" means to make available to the public the original and
copies of the Work or Adaptation, as appropriate, through sale or
other transfer of ownership.
d. "Licensor" means the individual, individuals, entity or entities that
offer(s) the Work under the terms of this License.
e. "Original Author" means, in the case of a literary or artistic work,
the individual, individuals, entity or entities who created the Work
or if no individual or entity can be identified, the publisher; and in
addition (i) in the case of a performance the actors, singers,
musicians, dancers, and other persons who act, sing, deliver, declaim,
play in, interpret or otherwise perform literary or artistic works or
expressions of folklore; (ii) in the case of a phonogram the producer
being the person or legal entity who first fixes the sounds of a
performance or other sounds; and, (iii) in the case of broadcasts, the
organization that transmits the broadcast.
f. "Work" means the literary and/or artistic work offered under the terms
of this License including without limitation any production in the
literary, scientific and artistic domain, whatever may be the mode or
form of its expression including digital form, such as a book,
pamphlet and other writing; a lecture, address, sermon or other work
of the same nature; a dramatic or dramatico-musical work; a
choreographic work or entertainment in dumb show; a musical
composition with or without words; a cinematographic work to which are
assimilated works expressed by a process analogous to cinematography;
a work of drawing, painting, architecture, sculpture, engraving or
lithography; a photographic work to which are assimilated works
expressed by a process analogous to photography; a work of applied
art; an illustration, map, plan, sketch or three-dimensional work
relative to geography, topography, architecture or science; a
performance; a broadcast; a phonogram; a compilation of data to the
extent it is protected as a copyrightable work; or a work performed by
a variety or circus performer to the extent it is not otherwise
considered a literary or artistic work.
g. "You" means an individual or entity exercising rights under this
License who has not previously violated the terms of this License with
respect to the Work, or who has received express permission from the
Licensor to exercise rights under this License despite a previous
violation.
h. "Publicly Perform" means to perform public recitations of the Work and
to communicate to the public those public recitations, by any means or
process, including by wire or wireless means or public digital
performances; to make available to the public Works in such a way that
members of the public may access these Works from a place and at a
place individually chosen by them; to perform the Work to the public
by any means or process and the communication to the public of the
performances of the Work, including by public digital performance; to
broadcast and rebroadcast the Work by any means including signs,
sounds or images.
i. "Reproduce" means to make copies of the Work by any means including
without limitation by sound or visual recordings and the right of
fixation and reproducing fixations of the Work, including storage of a
protected performance or phonogram in digital form or other electronic
medium.
2. Fair Dealing Rights. Nothing in this License is intended to reduce,
limit, or restrict any uses free from copyright or rights arising from
limitations or exceptions that are provided for in connection with the
copyright protection under copyright law or other applicable laws.
3. License Grant. Subject to the terms and conditions of this License,
Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
perpetual (for the duration of the applicable copyright) license to
exercise the rights in the Work as stated below:
a. to Reproduce the Work, to incorporate the Work into one or more
Collections, and to Reproduce the Work as incorporated in the
Collections;
b. to create and Reproduce Adaptations provided that any such Adaptation,
including any translation in any medium, takes reasonable steps to
clearly label, demarcate or otherwise identify that changes were made
to the original Work. For example, a translation could be marked "The
original work was translated from English to Spanish," or a
modification could indicate "The original work has been modified.";
c. to Distribute and Publicly Perform the Work including as incorporated
in Collections; and,
d. to Distribute and Publicly Perform Adaptations.
The above rights may be exercised in all media and formats whether now
known or hereafter devised. The above rights include the right to make
such modifications as are technically necessary to exercise the rights in
other media and formats. Subject to Section 8(f), all rights not expressly
granted by Licensor are hereby reserved, including but not limited to the
rights set forth in Section 4(d).
4. Restrictions. The license granted in Section 3 above is expressly made
subject to and limited by the following restrictions:
a. You may Distribute or Publicly Perform the Work only under the terms
of this License. You must include a copy of, or the Uniform Resource
Identifier (URI) for, this License with every copy of the Work You
Distribute or Publicly Perform. You may not offer or impose any terms
on the Work that restrict the terms of this License or the ability of
the recipient of the Work to exercise the rights granted to that
recipient under the terms of the License. You may not sublicense the
Work. You must keep intact all notices that refer to this License and
to the disclaimer of warranties with every copy of the Work You
Distribute or Publicly Perform. When You Distribute or Publicly
Perform the Work, You may not impose any effective technological
measures on the Work that restrict the ability of a recipient of the
Work from You to exercise the rights granted to that recipient under
the terms of the License. This Section 4(a) applies to the Work as
incorporated in a Collection, but this does not require the Collection
apart from the Work itself to be made subject to the terms of this
License. If You create a Collection, upon notice from any Licensor You
must, to the extent practicable, remove from the Collection any credit
as required by Section 4(c), as requested. If You create an
Adaptation, upon notice from any Licensor You must, to the extent
practicable, remove from the Adaptation any credit as required by
Section 4(c), as requested.
b. You may not exercise any of the rights granted to You in Section 3
above in any manner that is primarily intended for or directed toward
commercial advantage or private monetary compensation. The exchange of
the Work for other copyrighted works by means of digital file-sharing
or otherwise shall not be considered to be intended for or directed
toward commercial advantage or private monetary compensation, provided
there is no payment of any monetary compensation in connection with
the exchange of copyrighted works.
c. If You Distribute, or Publicly Perform the Work or any Adaptations or
Collections, You must, unless a request has been made pursuant to
Section 4(a), keep intact all copyright notices for the Work and
provide, reasonable to the medium or means You are utilizing: (i) the
name of the Original Author (or pseudonym, if applicable) if supplied,
and/or if the Original Author and/or Licensor designate another party
or parties (e.g., a sponsor institute, publishing entity, journal) for
attribution ("Attribution Parties") in Licensor's copyright notice,
terms of service or by other reasonable means, the name of such party
or parties; (ii) the title of the Work if supplied; (iii) to the
extent reasonably practicable, the URI, if any, that Licensor
specifies to be associated with the Work, unless such URI does not
refer to the copyright notice or licensing information for the Work;
and, (iv) consistent with Section 3(b), in the case of an Adaptation,
a credit identifying the use of the Work in the Adaptation (e.g.,
"French translation of the Work by Original Author," or "Screenplay
based on original Work by Original Author"). The credit required by
this Section 4(c) may be implemented in any reasonable manner;
provided, however, that in the case of a Adaptation or Collection, at
a minimum such credit will appear, if a credit for all contributing
authors of the Adaptation or Collection appears, then as part of these
credits and in a manner at least as prominent as the credits for the
other contributing authors. For the avoidance of doubt, You may only
use the credit required by this Section for the purpose of attribution
in the manner set out above and, by exercising Your rights under this
License, You may not implicitly or explicitly assert or imply any
connection with, sponsorship or endorsement by the Original Author,
Licensor and/or Attribution Parties, as appropriate, of You or Your
use of the Work, without the separate, express prior written
permission of the Original Author, Licensor and/or Attribution
Parties.
d. For the avoidance of doubt:
i. Non-waivable Compulsory License Schemes. In those jurisdictions in
which the right to collect royalties through any statutory or
compulsory licensing scheme cannot be waived, the Licensor
reserves the exclusive right to collect such royalties for any
exercise by You of the rights granted under this License;
ii. Waivable Compulsory License Schemes. In those jurisdictions in
which the right to collect royalties through any statutory or
compulsory licensing scheme can be waived, the Licensor reserves
the exclusive right to collect such royalties for any exercise by
You of the rights granted under this License if Your exercise of
such rights is for a purpose or use which is otherwise than
noncommercial as permitted under Section 4(b) and otherwise waives
the right to collect royalties through any statutory or compulsory
licensing scheme; and,
iii. Voluntary License Schemes. The Licensor reserves the right to
collect royalties, whether individually or, in the event that the
Licensor is a member of a collecting society that administers
voluntary licensing schemes, via that society, from any exercise
by You of the rights granted under this License that is for a
purpose or use which is otherwise than noncommercial as permitted
under Section 4(c).
e. Except as otherwise agreed in writing by the Licensor or as may be
otherwise permitted by applicable law, if You Reproduce, Distribute or
Publicly Perform the Work either by itself or as part of any
Adaptations or Collections, You must not distort, mutilate, modify or
take other derogatory action in relation to the Work which would be
prejudicial to the Original Author's honor or reputation. Licensor
agrees that in those jurisdictions (e.g. Japan), in which any exercise
of the right granted in Section 3(b) of this License (the right to
make Adaptations) would be deemed to be a distortion, mutilation,
modification or other derogatory action prejudicial to the Original
Author's honor and reputation, the Licensor will waive or not assert,
as appropriate, this Section, to the fullest extent permitted by the
applicable national law, to enable You to reasonably exercise Your
right under Section 3(b) of this License (right to make Adaptations)
but not otherwise.
5. Representations, Warranties and Disclaimer
UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
7. Termination
a. This License and the rights granted hereunder will terminate
automatically upon any breach by You of the terms of this License.
Individuals or entities who have received Adaptations or Collections
from You under this License, however, will not have their licenses
terminated provided such individuals or entities remain in full
compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
survive any termination of this License.
b. Subject to the above terms and conditions, the license granted here is
perpetual (for the duration of the applicable copyright in the Work).
Notwithstanding the above, Licensor reserves the right to release the
Work under different license terms or to stop distributing the Work at
any time; provided, however that any such election will not serve to
withdraw this License (or any other license that has been, or is
required to be, granted under the terms of this License), and this
License will continue in full force and effect unless terminated as
stated above.
8. Miscellaneous
a. Each time You Distribute or Publicly Perform the Work or a Collection,
the Licensor offers to the recipient a license to the Work on the same
terms and conditions as the license granted to You under this License.
b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
offers to the recipient a license to the original Work on the same
terms and conditions as the license granted to You under this License.
c. If any provision of this License is invalid or unenforceable under
applicable law, it shall not affect the validity or enforceability of
the remainder of the terms of this License, and without further action
by the parties to this agreement, such provision shall be reformed to
the minimum extent necessary to make such provision valid and
enforceable.
d. No term or provision of this License shall be deemed waived and no
breach consented to unless such waiver or consent shall be in writing
and signed by the party to be charged with such waiver or consent.
e. This License constitutes the entire agreement between the parties with
respect to the Work licensed here. There are no understandings,
agreements or representations with respect to the Work not specified
here. Licensor shall not be bound by any additional provisions that
may appear in any communication from You. This License may not be
modified without the mutual written agreement of the Licensor and You.
f. The rights granted under, and the subject matter referenced, in this
License were drafted utilizing the terminology of the Berne Convention
for the Protection of Literary and Artistic Works (as amended on
September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
and the Universal Copyright Convention (as revised on July 24, 1971).
These rights and subject matter take effect in the relevant
jurisdiction in which the License terms are sought to be enforced
according to the corresponding provisions of the implementation of
those treaty provisions in the applicable national law. If the
standard suite of rights granted under applicable copyright law
includes additional rights not granted under this License, such
additional rights are deemed to be included in the License; this
License is not intended to restrict the license of any rights under
applicable law.
Creative Commons Notice
Creative Commons is not a party to this License, and makes no warranty
whatsoever in connection with the Work. Creative Commons will not be
liable to You or any party on any legal theory for any damages
whatsoever, including without limitation any general, special,
incidental or consequential damages arising in connection to this
license. Notwithstanding the foregoing two (2) sentences, if Creative
Commons has expressly identified itself as the Licensor hereunder, it
shall have all rights and obligations of Licensor.
Except for the limited purpose of indicating to the public that the
Work is licensed under the CCPL, Creative Commons does not authorize
the use by either party of the trademark "Creative Commons" or any
related trademark or logo of Creative Commons without the prior
written consent of Creative Commons. Any permitted use will be in
compliance with Creative Commons' then-current trademark usage
guidelines, as may be published on its website or otherwise made
available upon request from time to time. For the avoidance of doubt,
this trademark restriction does not form part of the License.
Creative Commons may be contacted at http://creativecommons.org/.

View File

@@ -0,0 +1,73 @@
SUMMARY="An app to keep your latest copies"
DESCRIPTION="
Ever had something important in your clipboard but you copied something \
else? ClipUp allows you to save multiple clips, and can be shown by \
pressing option+space or clicking on the icon. It can save your clipboard content \
even when rebooting the computer!
"
HOMEPAGE="https://github.com/HaikuArchives/ClipUp"
SRC_URI="git://github.com/HaikuArchives/ClipUp.git#a9218f7c0148d818969105e84d3d5e176f580521"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="2002 Werner Freytag"
ARCHITECTURES="x86_gcc2"
PROVIDES="
clipup = $portVersion
app:clipup = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_PREREQUIRES="
makefile_engine
cmd:make
cmd:mkdepend
cmd:gcc
cmd:xres
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
"
BUILD()
{
cd trunk
cd "Input Device"
make
cd "../Input Filter"
make
cd "../Main"
make
cd ..
}
INSTALL()
{
cd trunk
mkdir -p $addOnsDir/input_server/devices
mkdir -p $addOnsDir/input_server/filters
cd "Input Device"
make install INSTALL_DIR=temp
mv temp/* $addOnsDir/input_server/devices
cd ..
cd "Input Filter"
make install INSTALL_DIR=temp
mv temp/* $addOnsDir/input_server/filters
cd ..
cd "Main"
make install INSTALL_DIR=$appsDir
mkdir -p "$dataDir/deskbar/menu/Desktop applets"
symlinkRelative -s "$appsDir/ClipUp" "$dataDir/deskbar/menu/Desktop applets"
}

View File

@@ -0,0 +1,56 @@
SUMMARY="An open source media compositing tool for the Haiku platform"
DESCRIPTION="Clockwerk is an Open Source media compositing tool for the Haiku platform.
It has been in development from Jan 2006 to July 2008 by Mindwork (www.mindwork.de) as one of the main in-house components of an application suit to realize distributed multimedia playback on Haiku client machines."
HOMEPAGE="https://github.com/stippi/Clockwerk"
SRC_URI="git+https://github.com/stippi/Clockwerk.git#8c3a33e"
REVISION="1"
LICENSE="GNU GPL v2"
COPYRIGHT="
2001-2009 Stephan Aßmus <superstippi@gmx.de>
2000-2006 Ingo Weinhold <ingo_weinhold@gmx.de>
"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
clockwerk = $portVersion
app:clockwerk = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libfreetype$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:jam
"
USER_SETTINGS_FILES="
settings/mindwork-m3 directory
"
BUILD()
{
jam -q
}
INSTALL()
{
mkdir -p $appsDir
jam fulldistro
cd generated/distro-haiku-with-libs
cp Clockwerk $appsDir
addAppDeskbarSymlink $appsDir/Clockwerk
}

View File

@@ -0,0 +1,46 @@
SUMMARY="A Tracker add-on to get the path to a file quick and easy"
DESCRIPTION="
This Tracker add-on allows you to get the path to one or more files, \
in different ways:
Holding shift copies just the file name, and holding control \
prints just one file name/path per line.
"
HOMEPAGE="https://github.com/HaikuArchives/CopyNameToClipboard"
SRC_URI="git://github.com/HaikuArchives/CopyNameToClipboard.git#d0d1c757a156981232aec44e0f88a2f35cfe0b96"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="
2000 Werner Freytag
2012 Humdinger
"
ARCHITECTURES="x86_gcc2"
PROVIDES="
copynametoclipboard = $portVersion
app:copynametoclipboard = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_PREREQUIRES="
makefile_engine
cmd:mkdepend
cmd:g++
cmd:xres
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
"
BUILD()
{
cd trunk
make
}
INSTALL()
{
cd trunk
make install INSTALL_DIR=$addOnsDir/Tracker
}

View File

@@ -1,13 +1,15 @@
SUMMARY="Paladin is a open source integrated development environment (IDE)"
DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after\
BeOS' BeIDE."
DESCRIPTION="
Paladin is an open source integrated development environment (IDE) modeled \
after BeOS' BeIDE.
"
HOMEPAGE="http://paladin.sourceforge.net"
SRC_URI="git://github.com/HaikuArchives/Paladin"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="2008-2010 DarkWyrm"
ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
paladin = $portVersion
@@ -24,17 +26,20 @@ PROVIDES="
cmd:ccache = $portVersion
fastdep = 0.16
cmd:fastdep = 0.16
"
"
REQUIRES="
haiku >= $haikuVersion
lib:libpcre
lib:libz
"
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
devel:libpcre
devel:libz
"
"
BUILD_PREREQUIRES="
cmd:make
cmd:gcc
@@ -42,7 +47,8 @@ BUILD_PREREQUIRES="
cmd:jam
cmd:bison
cmd:flex
"
"
USER_SETTINGS_FILE="settings/Paladin_settings"
SOURCE_DIR="Paladin"
@@ -51,6 +57,7 @@ BUILD()
{
./buildsuite.sh 1
}
INSTALL()
{
mkdir -p $appsDir/Paladin

View File

@@ -0,0 +1,46 @@
SUMMARY="A spider solitaire clone for Haiku"
DESCRIPTION="
Spider solitaire is a popular version of solitaire, where the goal \
is to stack all the cards of a suit, from king to ace.
When you have stacked as many cards as you can, you can use a \
stock to place a new card on top of every pile.
"
HOMEPAGE="https://github.com/HaikuArchives/BeSpider"
SRC_URI="git://github.com/HaikuArchives/BeSpider.git#2af10fba06839a79a96b7cde98fd7e10abce7ec9"
LICENSE="MIT"
COPYRIGHT="2013 Przemysław Buczkowski,
2013 Luke (noryb009)"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
bespider = $portVersion
app:bespider = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc
makefile_engine
cmd:make
cmd:mkdepend
"
BUILD()
{
make
make bindcatalogs
}
INSTALL()
{
make install INSTALL_DIR=$appsDir
addAppDeskbarSymlink $appsDir/BeSpider
}

View File

@@ -0,0 +1,100 @@
SUMMARY="Open source web browser engine"
DESCRIPTION="
WebKit is an open source web browser engine. WebKit is also the name of the \
Mac OS X system framework version of the engine that's used by Safari, \
Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
"
HOMEPAGE="http://www.webkit.org/"
COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
LICENSE="
GNU LGPL v2
GNU LGPL v2.1
MIT
"
SRC_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.2-Source.tar.bz2"
CHECKSUM_MD5="095cae2a51451639c7566611f498e295"
REVISION="1"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
haikuwebkit$secondaryArchSuffix = $portVersion
lib:libWebKit$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libicuuc$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libxslt$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion
devel:libicuuc$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libxslt$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:pkg_config
cmd:flex
cmd:bison
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:ld$secondaryArchSuffix
cmd:m4
cmd:make
cmd:perl
cmd:python
cmd:cmake
cmd:ruby
"
SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
BUILD()
{
export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
Tools/Scripts/build-webkit --haiku --no-webkit2 \
--cmakearg="-DCMAKE_INSTALL_PREFIX=$prefix"
}
INSTALL()
{
cd WebKitBuild/Release
make install
rm $developLibDir/*
prepareInstalledDevelLibs libWebKit
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
haikuwebkit${secondaryArchSuffix}_devel = $portVersion
devel:libjavascriptcore$secondaryArchSuffix = $portVersion
devel:libwebcore$secondaryArchSuffix = $portVersion
devel:libWebKit$secondaryArchSuffix = $portVersion
devel:libwtf$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
haikuwebkit$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,76 @@
SUMMARY="A disc burning library for Haiku"
DESCRIPTION="
LibBurnDevice is a disc burning library for Haiku
"
HOMEPAGE="https://github.com/HaikuArchives/Lava"
SRC_URI="git+https://github.com/HaikuArchives/Lava.git"
REVISION="1"
LICENSE="Public Domain"
COPYRIGHT="
2007, 2010 Team MAUI
2003-2006 Haiku Inc.
"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTRUES="x86_gcc2 x86"
PROVIDES="
libburndevice = $portVersion
lib:libburndevice$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
cmd:cdrtools
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:mkdepend
makefile_engine"
BUILD()
{
exit 0
cd LibBurnDevice
make TYPE=SHARED OBJ_DIR=objects-shared \
BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY)
make TYPE=STATIC OBJ_DIR=objects-static \
BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY)
}
INSTALL()
{
mkdir -p $libDir $developLibDir $includeDir/burndevice
cd LibBurnDevice
cp objects-static/libburndevice.a $developLibDir
cp objects-shared/libburndevice $libDir/libburndevice.so
cp BurnDevice.h $includeDir/burndevice
symlinkRelative -s $libDir/libburndevice.so $developLibDir
packageEntries devel \
$developLibDir \
$includeDir
}
# -------- devel package --------------------------------------------------
PROVIDES_devel="
libburndevice${secondaryArchSuffix}_devel = $portVersion
devel:libburndevice$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libburndevice$secondaryArchSuffix == $portVersion base
"

View File

@@ -1,7 +1,9 @@
SUMMARY="Custom widget library"
DESCRIPTION="
libsanta has some useful custom widgets (color picker, column list view, \
scroll view, etc.).
libsanta has some useful custom widgets (color picker, column \
list view, scroll view etc.)
NOT recommended for new apps! Use Haiku's Layout Manager instead. \
The recipe exists only for legacy BeOS apps.
"
HOMEPAGE="https://github.com/HaikuArchives/SantasGiftBag"
COPYRIGHT="briant@timelinevista.com"
@@ -31,8 +33,6 @@ BUILD_PREREQUIRES="
cmd:mkdepend
"
PATCHES="libsanta-0.0.1.patchset"
BUILD()
{
make TYPE=STATIC \
@@ -54,7 +54,10 @@ INSTALL()
cp libsanta.a $developLibDir
cd ../obj-shared
cp libsanta $libDir/libsanta.so
cp libsanta $libDir/libsanta.so.3.0.0
ln -s $libDir/libsanta.so.3.0.0 $libDir/libsanta.so.3
ln -s $libDir/libsanta.so.3.0.0 $libDir/libsanta.so
cd ..
@@ -72,7 +75,7 @@ INSTALL()
./PrefilledBitmap/PrefilledBitmap.h \
./ScrollViewCorner/ScrollViewCorner.h $includeDir/santa
symlinkRelative -s $libDir/libsanta.so $developLibDir
symlinkRelative -s $libDir/libsanta.so.3.0.0 $developLibDir
packageEntries devel \
$developLibDir \

View File

@@ -1,22 +0,0 @@
From 459e758be3720ec93b1029eea0db2af14db38121 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Fri, 13 Dec 2013 00:03:52 -0700
Subject: Fix stdc++ libs on gcc4
diff --git a/Makefile b/Makefile
index 57c3914..2719e8d 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ RSRCS=
# naming scheme you need to specify the path to the library
# and it's name
# library: my_lib.a entry: my_lib.a or path/my_lib.a
-LIBS= be root stdc++.r4
+LIBS= be root $(STDCPPLIBS)
# specify additional paths to directories following the standard
# libXXX.so or libXXX.a naming scheme. You can specify full paths
--
1.8.3.4

View File

@@ -154,3 +154,27 @@ index 654c01c..2a9b171 100644
--
1.8.3.4
From 8a85c675661240b48a07625473da010646ea6e17 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 30 Nov 2013 11:36:07 +0100
Subject: Avoid a crash when not started from terminal.
BeOS seems to set TERM environment variable to "dumb", but we don't.
diff --git a/src/beos/bsysapi.cpp b/src/beos/bsysapi.cpp
index c6e4dad..a7c9d46 100644
--- a/src/beos/bsysapi.cpp
+++ b/src/beos/bsysapi.cpp
@@ -128,7 +128,7 @@ static int32 system_thread(void *data)
using_custom_allegro_app = false;
term = getenv("TERM");
- if (!strcmp(term, "dumb")) {
+ if (!term || !strcmp(term, "dumb")) {
/* The TERM environmental variable is set to "dumb" if the app was
* not started from a terminal.
*/
--
1.8.3.4

View File

@@ -70,6 +70,7 @@ INSTALL()
make install
prepareInstalledDevelLibs libFLAC
prepareInstalledDevelLibs libFLAC++
fixPkgconfig
# devel package

View File

@@ -0,0 +1,49 @@
SUMMARY="GD is an open source library for the dynamic creation of images by programmers."
DESCRIPTION="GD is an open source library for the dynamic creation of images by programmers."
HOMEPAGE="http://www.libgd.org"
SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lbgd-2.1.0.tar.xz"
CHECKSUM_MD5="39ac48e6d5e0012a3bd2248a0102f209"
REVISION="1"
COPYRIGHT="1999-2013 "
LICENSE="LIBGD"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
PROVIDES="
gd = $portVersion
cmd:gd
"
REQUIRES="
haiku >= $haikuVersion
lib:libpng
lib:libjpeg
lib:libgif
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:cmake
cmd:make
"
BUILD()
{
echo libdir=$libDir
libtoolize --force --copy --install
aclocal -I config
autoconf
automake
runConfigure ./configure
make
}
INSTALL()
{
make install
}

View File

@@ -20,6 +20,7 @@ PROVIDES="
REQUIRES="
haiku${secondaryArchSuffix}
lib:libsdl$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
"
BUILD_REQUIRES="

View File

@@ -7,13 +7,14 @@ OpenGL.
HOMEPAGE="http://www.libsdl.org/"
SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85"
REVISION="3"
REVISION="4"
LICENSE="GNU LGPL v2.1"
COPYRIGHT="1997-2012 Sam Lantinga"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libsdl-1.2.15.patchset"
PROVIDES="
libsdl$secondaryArchSuffix = $portVersion
lib:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
@@ -161,4 +162,5 @@ PROVIDES_devel="
REQUIRES_devel="
libsdl${secondaryArchSuffix} == $portVersion base
devel:libGL$secondaryArchSuffix
"

View File

@@ -0,0 +1,249 @@
From ca09de99c346e44cdd1f578848b4958067b5fb06 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Nov 2013 23:38:56 +0100
Subject: Remove Alsa and ESD detection
These will fail on Haiku, and we don't need them anyway.
diff --git a/configure.in b/configure.in
index 08c8e1e..84d9a55 100644
--- a/configure.in
+++ b/configure.in
@@ -361,7 +361,7 @@ CheckALSA()
AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
, enable_alsa=yes)
if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
- AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)
+ have_alsa=no
# Restore all flags from before the ALSA detection runs
CFLAGS="$alsa_save_CFLAGS"
LDFLAGS="$alsa_save_LDFLAGS"
@@ -460,7 +460,7 @@ CheckESD()
AC_HELP_STRING([--enable-esd], [support the Enlightened Sound Daemon [[default=yes]]]),
, enable_esd=yes)
if test x$enable_audio = xyes -a x$enable_esd = xyes; then
- AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)
+ have_esd=no
if test x$have_esd = xyes; then
AC_ARG_ENABLE(esd-shared,
AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
@@ -2963,3 +2963,4 @@ AC_OUTPUT([
: >build-deps
if test x"$MAKE" = x; then MAKE=make; fi; $MAKE depend
])
+AC_CONFIG_MACRO_DIR([acinclude])
--
1.8.3.4
From 735586f7d0600476b0b02206daa76926193da957 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Nov 2013 23:39:26 +0100
Subject: Fix samples vs bytes issues
This was particularly noticeable in Milkytracker (SDL version) and
Hivelytracker, where all the audio timing relies on the buffer being
played during the right time.
diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc
index de635f8..7faf571 100644
--- a/src/audio/baudio/SDL_beaudio.cc
+++ b/src/audio/baudio/SDL_beaudio.cc
@@ -199,11 +199,11 @@ int BE_OpenAudio(_THIS, SDL_AudioSpec *spec)
return (-1);
}
- format.buffer_size = spec->samples;
-
/* Calculate the final parameters for this audio specification */
SDL_CalculateAudioSpec(spec);
+ format.buffer_size = spec->samples;
+
/* Subscribe to the audio stream (creates a new thread) */
{ sigset_t omask;
SDL_MaskSignals(&omask);
--
1.8.3.4
From 164201f49d1310bdd229feaf33c1f0e988a89f49 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Nov 2013 23:40:12 +0100
Subject: Various fixes to the video code
* Do not center the window each time it is resized
* Do not reset video mode if we didn't enter fullscreen
* remove annoying debug print
diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
index c32b661..a26f18b 100644
--- a/src/video/bwindow/SDL_sysvideo.cc
+++ b/src/video/bwindow/SDL_sysvideo.cc
@@ -406,6 +406,7 @@ static int BE_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen)
{
// printf("SetFullScreen(%d)\n", fullscreen);
BScreen bscreen;
+ static bool firstTime = true;
// SetFullSscreen() does not work as expected if called in a window
// that was never shown. This is probably a bug in the Haiku Game Kit that needs
@@ -425,6 +426,8 @@ static int BE_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen)
int width = screen->w;
int height = screen->h;
+ bool wasFullScreen = SDL_Win->IsFullScreen();
+
if (fullscreen) {
// Set resolution to the closest available one that matches the
// current SDL resolution.
@@ -444,7 +447,8 @@ static int BE_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen)
} else {
// Reset to the previous known resolution as we are now in window
// mode.
- bscreen.SetMode(&saved_mode);
+ if(wasFullScreen)
+ bscreen.SetMode(&saved_mode);
}
// Effectivelly set/reset full screen mode. If we are already in
@@ -456,14 +460,6 @@ static int BE_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen)
// printf("Going windowed\n");
SDL_Win->SetFullScreen(fullscreen);
- // Calculate offsets for centering the window (in window mode) and for
- // dentering the bitmap (in full screen mode).
- BRect bounds = bscreen.Frame();
- bounds.PrintToStream();
- int32 cx = (bounds.IntegerWidth() - width)/2;
- int32 cy = (bounds.IntegerHeight() - height)/2;
-
- // printf ("cx = %d, cy = %d\n", cx, cy);
if (!SDL_Win->IsFullScreen()) {
// printf("Doing not fullscreen stuff.\n");
// We are not in full screen mode, so we want to change the window
@@ -471,10 +467,18 @@ static int BE_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen)
SDL_Win->ResizeTo(width, height);
// And also center the window and reset the drawing offset.
- SDL_Win->MoveTo(cx, cy);
+ if(firstTime || wasFullScreen) {
+ SDL_Win->CenterOnScreen();
+ firstTime = false;
+ }
SDL_Win->SetXYOffset(0, 0);
} else {
- // printf("Doing fullscreen stuff.");
+ // Calculate offsets for centering the bitmap.
+
+ BRect bounds = bscreen.Frame();
+ int cx = (bounds.Width() - width) / 2;
+ int cy = (bounds.Height() - height) / 2;
+
// Center the bitmap whenever we are in full screen mode.
SDL_Win->SetXYOffset(cx, cy);
}
--
1.8.3.4
From ae129e6505148189a3d73fc085f20e214c0d6446 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 23 Nov 2013 11:59:00 +0100
Subject: Actually fix the sample vs bytes problem in audio driver.
diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc
index 7faf571..300bf03 100644
--- a/src/audio/baudio/SDL_beaudio.cc
+++ b/src/audio/baudio/SDL_beaudio.cc
@@ -161,25 +161,30 @@ int BE_OpenAudio(_THIS, SDL_AudioSpec *spec)
format.byte_order = B_MEDIA_LITTLE_ENDIAN;
format.frame_rate = (float) spec->freq;
format.channel_count = spec->channels; /* !!! FIXME: support > 2? */
+ int samplesize = 1;
while ((!valid_datatype) && (test_format)) {
valid_datatype = 1;
spec->format = test_format;
switch (test_format) {
case AUDIO_S8:
format.format = media_raw_audio_format::B_AUDIO_CHAR;
+ samplesize = 1;
break;
case AUDIO_U8:
format.format = media_raw_audio_format::B_AUDIO_UCHAR;
+ samplesize = 1;
break;
case AUDIO_S16LSB:
format.format = media_raw_audio_format::B_AUDIO_SHORT;
+ samplesize = 2;
break;
case AUDIO_S16MSB:
format.format = media_raw_audio_format::B_AUDIO_SHORT;
format.byte_order = B_MEDIA_BIG_ENDIAN;
+ samplesize = 2;
break;
default:
@@ -202,7 +207,7 @@ int BE_OpenAudio(_THIS, SDL_AudioSpec *spec)
/* Calculate the final parameters for this audio specification */
SDL_CalculateAudioSpec(spec);
- format.buffer_size = spec->samples;
+ format.buffer_size = spec->samples * spec->channels * samplesize;
/* Subscribe to the audio stream (creates a new thread) */
{ sigset_t omask;
--
1.8.3.4
From 9b20d4dc8a3f5d607623b5d8b2c4ce14e830f4c8 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 22 Dec 2013 18:37:30 -0700
Subject: Remove Haiku from specialized DECLSPEC definition
diff --git a/include/begin_code.h b/include/begin_code.h
index 27e2f7b..d5e2f1f 100644
--- a/include/begin_code.h
+++ b/include/begin_code.h
@@ -41,7 +41,7 @@
* Some compilers use a special export keyword
*/
#ifndef DECLSPEC
-# if defined(__BEOS__) || defined(__HAIKU__)
+# if defined(__BEOS__)
# if defined(__GNUC__)
# define DECLSPEC
# else
--
1.8.3.4
From 09ba1fa7eccef32323c9987bdd4742bca6e9dfbc Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 17:22:10 +0100
Subject: Change prefix from "be" to "os" for OpenGL includes
Accomodate the new OpenGL kit that doesn't have the "be" symlink.
diff --git a/src/video/bwindow/SDL_BWin.h b/src/video/bwindow/SDL_BWin.h
index f2b19a2..2cb94ee 100644
--- a/src/video/bwindow/SDL_BWin.h
+++ b/src/video/bwindow/SDL_BWin.h
@@ -31,7 +31,7 @@
#include <be/game/DirectWindow.h>
#if SDL_VIDEO_OPENGL
#include "SDL_opengl.h"
-#include <be/opengl/GLView.h>
+#include <os/opengl/GLView.h>
#endif
#include <support/UTF8.h>
--
1.8.3.4

View File

@@ -15,8 +15,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libwebp$secondaryArchSuffix = $portVersion
lib:libwebp$secondaryArchSuffix = $portVersion
cmd:cwebp
cmd:dwebp
cmd:cwebp$secondaryArchSuffix
cmd:dwebp$secondaryArchSuffix
"
REQUIRES="

View File

@@ -21,22 +21,24 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
sdl_image$secondaryArchSuffix = $portVersion compat >= 1.2
lib:libSDL_image$secondaryArchSuffix = 1.2_0.8.4 compat >= 1.2_0
lib:libSDL_image_1.2 = $portVersion compat >= 0
lib:libSDL_image_1.2$secondaryArchSuffix = $portVersion compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
libsdl$secondaryArchSuffix
lib:libSDL$secondaryArchSuffix
lib:libSDL_1.2$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libsdl$secondaryArchSuffix
devel:libSDL$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
# devel:libtiff$secondaryArchSuffix

View File

@@ -25,7 +25,8 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libsdl$secondaryArchSuffix
lib:libSDL$secondaryArchSuffix
lib:libSDL_1.2$secondaryArchSuffix
lib:libflac$secondaryArchSuffix
# lib:libfluidsynth$secondaryArchSuffix
lib:libmad$secondaryArchSuffix
@@ -33,10 +34,11 @@ REQUIRES="
lib:libogg$secondaryArchSuffix
lib:libmikmod$secondaryArchSuffix
lib:libsmpeg$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libsdl$secondaryArchSuffix
devel:libSDL$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libflac$secondaryArchSuffix
# devel:libfluidsynth$secondaryArchSuffix

View File

@@ -29,6 +29,7 @@ REQUIRES="
lib:libsdl$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
"
BUILD_REQUIRES="

View File

@@ -26,12 +26,13 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libglu$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libSDL$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libsdl$secondaryArchSuffix
devel:libSDL$secondaryArchSuffix
devel:libglu$secondaryArchSuffix
"
@@ -44,7 +45,6 @@ BUILD_PREREQUIRES="
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
"
BUILD()

View File

@@ -17,27 +17,28 @@ SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz"
CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c"
REVISION="3"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="readline-6.2.patch"
PROVIDES="
readline = $portVersion compat >= 6
lib:libhistory = $portVersion compat >= 6
lib:libreadline = $portVersion compat >= 6
readline$secondaryArchSuffix = $portVersion compat >= 6
lib:libhistory$secondaryArchSuffix = $portVersion compat >= 6
lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6
"
REQUIRES="
haiku >= $haikuVersion
lib:libncurses
haiku$secondaryArchSuffix >= $haikuVersion
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libncurses
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:gcc
cmd:ld
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
@@ -70,10 +71,10 @@ INSTALL()
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
readline_devel = $portVersion
devel:libhistory = $portVersion compat >= 6
devel:libreadline = $portVersion compat >= 6
readline${secondaryArchSuffix}_devel = $portVersion
devel:libhistory$secondaryArchSuffix = $portVersion compat >= 6
devel:libreadline$secondaryArchSuffix = $portVersion compat >= 6
"
REQUIRES_devel="
readline == $portVersion base
readline$secondaryArchSuffix == $portVersion base
"