mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
BillardGL: fix build for gcc7
*fix build for gcc7 *disable for x86_gcc2 *add secondary arch (x86) (more fast and smooth) *cleanup app icon *add deskbar menu symlink
This commit is contained in:
Gerasim Troeglazov
38
games-sports/billardgl/additional-files/billardgl.rdef.in
Normal file
38
games-sports/billardgl/additional-files/billardgl.rdef.in
Normal file
@@ -0,0 +1,38 @@
|
||||
resource app_flags B_MULTIPLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = @MAJOR@,
|
||||
middle = @MIDDLE@,
|
||||
minor = 0,
|
||||
|
||||
variety = B_APPV_FINAL,
|
||||
internal = 0,
|
||||
|
||||
short_info = "BillardGL",
|
||||
long_info = "@LONG_INFO@"
|
||||
};
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource vector_icon array {
|
||||
$"6E63696605040082020116043ED0000000000000003F200048800048000000FF"
|
||||
$"68E3A1BBFF48020006033AE48F3B9AFBBC0B573B47D04A96DA496CC400F7CD06"
|
||||
$"87B5970EFF776203050003F7F9F6070204CBE2C904CDEAC492C9D8CD77BD3FCE"
|
||||
$"5BC34CCFDBB733CCDDB5FAC39AB3F2C80BB803BF27C49EBE42BE91BCC3CAAABF"
|
||||
$"C10204CA6DBEB6CA6DB83ECA6DC52FBEB6CA6EC530CA6DB83ECA6E1FBEB61FC5"
|
||||
$"301FB83EBEB51FB83E1FC52FB2FD0204B735B5C3BE17B775B51DB770B327BD0F"
|
||||
$"B403B9A0BC31BEFCC746C6AFC206C258C89CC52CCA4CBEA0CA76C2D1C54FBA3C"
|
||||
$"0204C4A9BD45C4A9BA46C4A9C043BF3EC2B2C23CC2B2BC3FC2B2B9D1BD45B9D1"
|
||||
$"C044B9D1BA46BF3DB7D9BC3FB7D9C23CB7D90206C139B940C1BBB977C069B8E8"
|
||||
$"BEC2B9A4BF73B924BDF8BA37BD9737BD71BB32BDAFBCD9BEE7BDA3BE35BD74BF"
|
||||
$"CABDE3C16ABCEDC0C3BD89C219BC4EC240BA6CC281BB53C21DB9E90205C0D8BA"
|
||||
$"03C0BDB9F644BA35C18CBB43C19FBAC2C173BC33BF84BCDCC07EBD00BF00BCCC"
|
||||
$"BE82BBDCBE91BC5DBE5EBAD0C080B9EBBF6AB9C9C09FB9EE0204C048BCE8BF50"
|
||||
$"BDB5C070BD4AC11ABD2543BCC2C022BDF2BDD1C04ABEA7BFFBBD89C066BC59BF"
|
||||
$"A4BC80C007BD50BED7070A000100023F90A20000000000003F99D843FC31B3AB"
|
||||
$"1A0A030101123F90A20000000000003F99D843FC3143FC5401178500040A0101"
|
||||
$"01023F90A20000000000003F99D843FC3143FC540A020102023F7F0400000000"
|
||||
$"00003F81BA43FDE04413170A040103023F90A20000000000003F99D843FC3143"
|
||||
$"FC540A03020405023F90A20000000000003F99D843FC3143FC540A030106023F"
|
||||
$"90A20000000000003F99D843FC3143FC54"
|
||||
};
|
||||
@@ -1,59 +0,0 @@
|
||||
/*
|
||||
* BillardGL.rdef
|
||||
*/
|
||||
|
||||
resource app_signature "application/x-vnd.BillardGL";
|
||||
|
||||
resource app_version {
|
||||
major = 1,
|
||||
middle = 75,
|
||||
minor = 0,
|
||||
variety = 0,
|
||||
internal = 0,
|
||||
short_info = "1.75",
|
||||
long_info = "BillardGL is a GPL 3D OpenGL Billard Simulator"
|
||||
};
|
||||
|
||||
|
||||
resource vector_icon {
|
||||
$"6E636966090400EC04002C03F9FAF704003003F4CD1A050003F8F9F604004D04"
|
||||
$"0021100204CBE2C905CDEBC493C9D9CD77BD3FCE5CC34CCFDBB733CCDDB5FBC3"
|
||||
$"9AB3F2C80CB804BF28C49EBE43BE92BCC4CAAABFC20204CBE2C905CDEBC493C9"
|
||||
$"D9CD77BD3FCE5CC34CCFDBB733CCDDB5FBC39AB3F2C80CB804BF28C49EBE43BE"
|
||||
$"92BCC4CAAABFC20204CA6EBEB7CA6EB83ECA6EC52FBEB7CA6FC530CA6EB83ECA"
|
||||
$"6F1FBEB71FC5301FB83EBEB61FB83E1FC52FB2FE0204CA6EBEB7CA6EB83ECA6E"
|
||||
$"C52FBEB7CA6FC530CA6EB83ECA6F1FBEB71FC5301FB83EBEB61FB83E1FC52FB2"
|
||||
$"FE0204B735B5C4BE17B776B51DB771B327BD0FB403B9A1BC31BEFCC746C6AFC2"
|
||||
$"06C259C89CC52DCA4CBEA1CA76C2D1C54FBA3D0204B735B5C4BE17B776B51DB7"
|
||||
$"71B327BD0FB403B9A1BC31BEFCC746C6AFC206C259C89CC52DCA4CBEA1CA76C2"
|
||||
$"D1C54FBA3D0204C4AABD46C4AABA47C4AAC044BF3EC2B2C23CC2B2BC3FC2B2B9"
|
||||
$"D1BD46B9D1C045B9D1BA47BF3DB7D9BC3FB7D9C23CB7D90204C4AABD46C4AABA"
|
||||
$"47C4AAC044BF3EC2B2C23CC2B2BC3FC2B2B9D1BD46B9D1C045B9D1BA47BF3DB7"
|
||||
$"D9BC3FB7D9C23CB7D90206C139B941C1BBB977C069B8E9BEC3B9A5BF73B924BD"
|
||||
$"F9BA37BD9737BD71BB32BDAFBCD9BEE7BDA3BE36BD74BFCBBDE3C16ABCEEC0C4"
|
||||
$"BD89C219BC4EC241BA6DC281BB54C21DB9E90205C0D9BA03C0BDB9F644BA35C1"
|
||||
$"8DBB43C19FBAC2C174BC33BF85BCDCC07FBD00BF00BCCCBE83BBDCBE92BC5DBE"
|
||||
$"5FBAD0C080B9EBBF6BB9CAC09FB9EF0206C139B941C1BBB977C069B8E9BEC3B9"
|
||||
$"A5BF73B924BDF9BA37BD9737BD71BB32BDAFBCD9BEE7BDA3BE36BD74BFCBBDE3"
|
||||
$"C16ABCEEC0C4BD89C219BC4EC241BA6DC281BB54C21DB9E90205C0D9BA03C0BD"
|
||||
$"B9F644BA35C18DBB43C19FBAC2C174BC33BF85BCDCC07FBD00BF00BCCCBE83BB"
|
||||
$"DCBE92BC5DBE5FBAD0C080B9EBBF6BB9CAC09FB9EF0204C049BCE8BF51BDB5C0"
|
||||
$"70BD4AC11ABD25C0F3BCC2C022BDF2BDD2C04BBEA8BFFCBD89C066BC59BFA4BC"
|
||||
$"80C007BD51BED70204C049BCE8BF51BDB5C070BD4AC11ABD25C0F3BCC2C022BD"
|
||||
$"F2BDD2C04BBEA8BFFCBD89C066BC59BFA4BC80C007BD51BED70204C8F5BE7EC8"
|
||||
$"F6B85DC8F6C49FBE23C998C41DC998B828C998B350BE7EB34FC4A0B34FB85DBE"
|
||||
$"22B364B828B365C41DB3640204C8F5BE7EC8F6B85DC8F6C49FBE23C998C41DC9"
|
||||
$"98B828C998B350BE7EB34FC4A0B34FB85DBE22B364B828B365C41DB3640E0A00"
|
||||
$"0100023F90A20000000000003F99D843FC31B3AB1A0A010101123F90A2000000"
|
||||
$"0000003F99D843FC31B3AB1A01178002040A020102023F90A20000000000003F"
|
||||
$"99D843FC31B3AB1A0A030103123F90A20000000000003F888443FC31B4253201"
|
||||
$"178002040A040104023F90A20000000000003F99D843FC31B3AB1A0A05010512"
|
||||
$"3F90A20000000000003F99D843FC31B3AB1A01178000040A060106023F90A200"
|
||||
$"00000000003F99D843FC31B3AB1A0A030107123F90A20000000000003F99D843"
|
||||
$"FC31B3AB1A01178002040A05020809023F90A20000000000003F99D843FC31B3"
|
||||
$"AB1A0A05020A0B123F90A20000000000003F99D843FC31B3AB1A01178000040A"
|
||||
$"05010C023F90A20000000000003F99D843FC31B3AB1A0A05010D123F90A20000"
|
||||
$"000000003F99D843FC31B3AB1A01178000040A07010E023F90A2000000000000"
|
||||
$"3F99D843FC31B3AB1A0A08010F123F90A20000000000003F99D843FC31B3AB1A"
|
||||
$"0117800204"
|
||||
};
|
||||
@@ -1,34 +1,37 @@
|
||||
SUMMARY="A 3D OpenGL Billard Simulator"
|
||||
DESCRIPTION="BillardGL is a very nice looking OpenGL pool billiard simulation,\
|
||||
which was developed within the scope of the course "Computergraphics" at the \
|
||||
which was developed within the scope of the course \"Computergraphics\" at the \
|
||||
University of Freiburg (Germany)"
|
||||
HOMEPAGE="https://sourceforge.net/projects/billardgl/"
|
||||
COPYRIGHT="2001-2008 Tobias Nopper"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="http://prdownloads.sourceforge.net/billardgl/BillardGL-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="9b865b1254aa30125480ec7ea2ce00d91524db066a524b78492545782856df96"
|
||||
SOURCE_DIR="BillardGL-$portVersion/src"
|
||||
PATCHES="billardgl-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="haiku_icon.rdef"
|
||||
ADDITIONAL_FILES="billardgl.rdef.in"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 ?x86"
|
||||
ARCHITECTURES="!x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
billardgl = $portVersion
|
||||
app:BillardGL
|
||||
billardgl$secondaryArchSuffix = $portVersion
|
||||
app:BillardGL$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libGLU$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
devel:libGL
|
||||
devel:libglu
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libglu$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:g++
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
@@ -43,6 +46,19 @@ INSTALL()
|
||||
cp BillardGL $appsDir/BillardGL
|
||||
cp -r lang $appsDir/BillardGL
|
||||
cp -r Texturen $appsDir/BillardGL
|
||||
addResourcesToBinaries $portDir/additional-files/haiku_icon.rdef \
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.BillardGL"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
sed \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
$portDir/additional-files/billardgl.rdef.in > $sourceDir/billardgl.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/billardgl.rdef \
|
||||
$appsDir/BillardGL/BillardGL
|
||||
addAppDeskbarSymlink $appsDir/BillardGL/BillardGL
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 22d3838f2067b7d6cc83b93b3fbe4bc971babbf0 Mon Sep 17 00:00:00 2001
|
||||
From 186837c0739785d3aa5fa1444f453e0723844d1c Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3deyes@gmail.com>
|
||||
Date: Fri, 27 Mar 2015 09:41:50 +0300
|
||||
Subject: Add Haiku support
|
||||
@@ -97,7 +97,7 @@ index 5ff8285..44cdae7 100644
|
||||
EffektLautstaerke = .5;
|
||||
MusikLautstaerke = .5;
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 2418824..000b578 100644
|
||||
index 2418824..75af448 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -8,11 +8,11 @@
|
||||
@@ -128,5 +128,37 @@ index fa3874b..b04a5c1 100644
|
||||
#endif
|
||||
|
||||
--
|
||||
2.2.2
|
||||
2.19.1
|
||||
|
||||
|
||||
From 61bab43b0afdf6c9dd93cdaba66b45d1fde2cd6f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 25 Nov 2018 12:29:17 +1000
|
||||
Subject: Fix build for gcc7
|
||||
|
||||
|
||||
diff --git a/bmp.cpp b/bmp.cpp
|
||||
index 2dafaac..6d92960 100644
|
||||
--- a/bmp.cpp
|
||||
+++ b/bmp.cpp
|
||||
@@ -4,14 +4,15 @@
|
||||
// Modified by Volker Blanz, 25.4.2001
|
||||
//
|
||||
|
||||
-#include <iostream.h>
|
||||
-#include <fstream.h>
|
||||
+#include <iostream>
|
||||
+#include <fstream>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "LA.h"
|
||||
#include "Namen.h"
|
||||
#include "bmp.h"
|
||||
|
||||
+using namespace std;
|
||||
// from ioutil:
|
||||
|
||||
WORDX readWord(FILE *f) {
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user