hrev49311 adds 5 changesets to branch 'master'
old head: b5c4af8ba8d144e160146568835e5e391ef20b07
new head: d39c3c2b2fc538afd38ef1b0d5d99d42ff9a578d
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=d39c3c2b2fc5+%5Eb5c4af8ba8d1
----------------------------------------------------------------------------
b87e672a059b: ReadMe.Compiling: rework to Markdown, cleanup links.
There are still probably issues with the walkthroughs in here,
but I don't cross-compile Haiku very often so someone else should
fix those.
6eafb4b041ad: Replace a few references to Subversion with Git.
There are a whole bunch more of these around, but these were the
ones I was confident replacing.
2e1e7847634f: checkstyle: add #! line, fix filemode.
1b5098018877: .gitignore: add .pyc and .pyo files.
d39c3c2b2fc5: accelerants/via: fix the build.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
10 files changed, 256 insertions(+), 272 deletions(-)
.gitignore | 6 +-
ReadMe.Compiling | 257 --------------------
ReadMe.Compiling.md | 236 ++++++++++++++++++
build/jam/UserBuildConfig.ReadMe | 6 +-
data/config/boot/UserSetupEnvironment.sample | 7 +-
src/add-ons/accelerants/via/engine/Jamfile | 2 +
src/add-ons/accelerants/via/engine/info.c | 6 +-
src/add-ons/kernel/drivers/graphics/via/Jamfile | 3 +-
src/system/libroot/os/system_revision.c | 2 +-
src/tools/checkstyle/checkstyle.py | 3 +-
############################################################################
Commit: b87e672a059b6af94943b91dab0a5b1bc13c935d
URL: http://cgit.haiku-os.org/haiku/commit/?id=b87e672a059b
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jun 19 19:17:14 2015 UTC
ReadMe.Compiling: rework to Markdown, cleanup links.
There are still probably issues with the walkthroughs in here,
but I don't cross-compile Haiku very often so someone else should
fix those.
----------------------------------------------------------------------------
diff --git a/ReadMe.Compiling b/ReadMe.Compiling
deleted file mode 100644
index b84b1d2..0000000
--- a/ReadMe.Compiling
+++ /dev/null
@@ -1,257 +0,0 @@
-Building Haiku from source
-==========================
-
-This is a overview into the process of building HAIKU from source.
-An online version is available at http://www.haiku-os.org/guides/building/
-
-Official releases of Haiku are at http://www.haiku-os.org/get-haiku
-The (unstable) nightly builds are available at http://www.haiku-files.org
-
-To build Haiku, you will need to
- * ensure pre-requisite software is installed
- * download sources
- * configure your build
- * run jam to initiate the build process
-
-We currently support these platforms:
- * Haiku
- * Linux
- * FreeBSD
- * Mac OS X Intel
-
-Pre-requisite software
-======================
-
-Tools provided within Haiku's repositories
-
- * Jam (Jam 2.5-haiku-20111222)
- * Haiku's cross-compiler (needed only for non-Haiku platforms)
-
-The tools to compile Haiku will vary, depending on the platform that you are
-using to build Haiku. When building from Haiku, all of the necessary
-development tools are included in official releases (e.g. R1 alpha 1) and in
the
-(unstable) nightly builds.
-
- * Git client
- * SSH client (for developers with commit access)
- * gcc and the binutils (as, ld, etc., required by gcc)
- * make (GNU make)
- * bison
- * flex and lex (usually a mini shell script invoking flex)
- * makeinfo (part of texinfo, needed for building gcc 4 only)
- * autoheader (part of autoconf, needed for building gcc)
- * automake
- * gawk
- * nasm
- * wget
- * (un)zip
- * cdrtools (not genisoimage!)
- * case-sensitive file system
-
-Whether they are installed can be tested for instance by running them in the
-shell with the "--version" parameter.
-
-The following libraries (and their respective headers) are required:
- * curl
- * zlib
-
-Specific: Haiku for the ARM platform
-------------------------------------
-
-The following tools are needed to compile Haiku for the ARM platform
-
- * mkimage (http://www.denx.de/wiki/UBoot)
- * Mtools (http://www.gnu.org/software/mtools/intro.html)
-
-Specific: Mac OS X
-------------------
-
-Disk Utility can create a case-sensitive disk image of at least 3 GiB in size.
-The following darwin ports need to be installed:
- * expat
- * gawk
- * gettext
- * libiconv
- * gnuregex
- * gsed
- * cdrtools
- * nasm
- * wget
- * less
- * mpfr
- * gmp
- * libmpc
-
-More information about individual distributions of Linux and BSD can be found
-at http://haiku-os.org/guides/building/pre-reqs
-
-
-Download Haiku's sources
-========================
-
-There are two parts to Haiku's sources -- the code for Haiku itself and a set
-of build tools for compiling Haiku on an operating system other than Haiku.
-The buildtools are needed only for non-Haiku platform.
-
-Anonymous checkout:
- git clone git://git.haiku-os.org/haiku
- git clone git://git.haiku-os.org/buildtools
-
-Developer with commit access:
- git clone ssh://git.haiku-os.org/haiku
- git clone ssh://git.haiku-os.org/buildtools
-
-
-Building the Jam executable
-===========================
-
-This step applies only to non-Haiku platforms.
-
-Change to the buildtools folder and we will start to build 'jam' which is a
-requirement for building Haiku. Run the following commands to generate and
-install the tool:
-
- cd buildtools/jam
- make
- sudo ./jam0 install
- -- or --
- ./jam0 -sBINDIR=$HOME/bin install
-
-
-Configuring your build
-======================
-
-The configure script generates a file named "BuildConfig" in the
-"generated/build" directory. As long as configure is not modified (!) or the
-cross-compilation tools have been updated, there is no need to call it again.
-That is for re-building you only need to invoke jam (see below). If you don't
-update the source tree very frequently, you may want to execute 'configure'
-after each update just to be on the safe side.
-
-Depending on your goal, there are several different ways to configure Haiku.
-You can either call configure from within your Haiku trunk folder. That will
-prepare a folder named 'generated', which will contain the compiled objects.
-Another option is to manually created one or more 'generated.*' folders and run
-configure from within them. For example imagine the following directory setup
-
- buildtools-trunk/
- haiku-trunk/
- haiku-trunk/generated.x86gcc2
-
-Configure a GCC 2.95 Hybrid, from non-Haiku platform
-----------------------------------------------------
-
- cd haiku-trunk/generated.x86gcc2
- ../configure --use-xattr-ref \
- --build-cross-tools x86_gcc2 ../../buildtools/ \
- --build-cross-tools x86
-
-Configure a GCC 2.95 Hybrid, from within Haiku
-----------------------------------------------
-
- cd haiku-trunk/generated.x86gcc2
- ../configure --target-arch x86_gcc2 --target-arch x86
-
-Additional information about GCC Hybrids can be found on the website,
-http://www.haiku-os.org/guides/building/gcc-hybrid
-
-Configure options
------------------
-
-The various runtime options for configure are documented in its onscreen help
-
- ./configure --help
-
-
-Building via Jam
-================
-
-Haiku can be built in either of two ways, as disk image file (e.g. for use
-with emulators, to be written directly to a usb stick, burned as a compact
-disc) or as installation in a directory.
-
-Running Jam
------------
-
-There are various ways in which you can run jam.
-
- * If you have a single generated folder,
- you can run 'jam' from the top level of Haiku's trunk.
- * If you have one or more generated folders,
- (e.g. generated.x86gcc2), you can cd into that directory and run 'jam'
- * In either case, you can cd into a certain folder in the source tree (e.g.
- src/apps/debugger) and run jam -sHAIKU_OUTPUT_DIR=<path to generated folder>
-
-Be sure to read build/jam/UserBuildConfig.ReadMe and UserBuildConfig.sample,
-as they contain information on customizing your build of Haiku.
-
-Building a Haiku anyboot file
----------------------------
-
- jam -q @anyboot-image
-
-This generates an image file named 'haiku-anyboot.image' in your output
-directory under 'generated/'.
-
-Building a VMware image file
-----------------------------
-
- jam -q @vmware-image
-
-This generates an image file named 'haiku.vmdk' in your output
-directory under 'generated/'.
-
-Directory Installation
-----------------------
-
- HAIKU_INSTALL_DIR=/Haiku jam -q @install
-
-Installs all Haiku components into the volume mounted at "/Haiku" and
-automatically marks it as bootable. To create a partition in the first place
-use DriveSetup and initialize it to BFS.
-
-Note that installing Haiku in a directory only works as expected under Haiku,
-but it is not yet supported under Linux and other non-Haiku platforms.
-
-Building individual components
-------------------------------
-
-If you don't want to build the complete Haiku, but only a certain
-app/driver/etc. you can specify it as argument to jam, e.g.:
-
- jam -q Debugger
-
-Alternatively, you can 'cd' to the directory of the component you want to
-build and run 'jam' from there. Note: if your generated directory named
-something other than "generated/", you will need to tell jam where it is.
-
- jam -q -sHAIKU_OUTPUT_DIR=<path to generated folder>
-
-You can also force rebuilding of a component by using the "-a" parameter:
-
- jam -qa Debugger
-
-
-Running
-=======
-
-Generally there are two ways of running Haiku. On real hardware using a
-partition and on emulated hardware using an emulator like Bochs or QEMU.
-
-On Real Hardware
-----------------
-
-If you have installed Haiku to its own partition you can include this
-partition in your bootmanager and try to boot Haiku like any other OS you
-have installed. To include a new partition in the Haiku bootmanager run this
-in a Terminal:
-
- BootManager
-
-On Emulated Hardware
---------------------
-
-For emulated hardware you should build disk image (see above). How to setup
-this image depends on your emulater. If you use QEMU, you can usually just
-provide the path to the image as command line argument to the "qemu"
-executable.
diff --git a/ReadMe.Compiling.md b/ReadMe.Compiling.md
new file mode 100644
index 0000000..7eb70cb
--- /dev/null
+++ b/ReadMe.Compiling.md
@@ -0,0 +1,236 @@
+Building Haiku
+==========================
+This is a overview into the process of building HAIKU from source.
+An online version is available at <https://haiku-os.org/guides/building/>.
+
+Official releases of Haiku are at <https://haiku-os.org/get-haiku>.
+The (unstable) nightly builds are available at
<https://download.haiku-os.org/>.
+
+We currently support the following platforms:
+ * Haiku
+ * Linux
+ * FreeBSD
+ * Mac OS X
+
+Required Software
+----------------------------
+Tools provided within Haiku's repositories:
+ * `jam` (Jam 2.5-haiku-20111222)
+ * Haiku's cross-compiler (needed only for non-Haiku platforms)
+
+The tools to compile Haiku will vary, depending on the platform that you are
+using to build Haiku. When building from Haiku, all of the necessary
+development tools are included in official releases (e.g. R1 alpha4) and in the
+nightly builds.
+
+ * `git`
+ * `ssh` (for developers with commit access)
+ * `gcc`/`g++` and binutils (`as`, `ld`, etc., required by GCC)
+ * (GNU) `make`
+ * `bison`
+ * `flex` and `lex` (usually a mini shell script invoking `flex`)
+ * `makeinfo` (part of `texinfo`, only needed for building GCC 4)
+ * `autoheader` (part of `autoconf`, needed for building GCC)
+ * `automake`
+ * `gawk`
+ * `nasm`
+ * `wget`
+ * `[un]zip`
+ * `cdrtools` (**not** `genisoimage`!)
+ * case-sensitive file system
+
+Whether they are installed can be tested by running them in a shell with
+the `--version` parameter.
+
+The following libraries (and their respective headers) are required:
+ * `curl`
+ * `zlib`
+
+### Haiku for ARM
+If you want to compile Haiku for ARM, you will also need:
+
+ * `mkimage` (<http://www.denx.de/wiki/U-Boot/WebHome>)
+ * Mtools (<https://gnu.org/software/mtools/intro.html>)
+
+### On Mac OS X
+
+Disk Utility can create a case-sensitive disk image of at least 3 GiB in size.
+The following ports need to be installed:
+ * `expat`
+ * `gawk`
+ * `gettext`
+ * `libiconv`
+ * `gnuregex`
+ * `gsed`
+ * `cdrtools`
+ * `nasm`
+ * `wget`
+ * `less`
+ * `mpfr`
+ * `gmp`
+ * `libmpc`
+
+More information about individual distributions of Linux and BSD can be found
+at <https://haiku-os.org/guides/building/pre-reqs>.
+
+Downloading Haiku's sources
+--------------------------------------------------
+There are two parts to Haiku's sources — the code for Haiku itself and a
set
+of build tools for compiling Haiku on an operating system other than Haiku.
+The buildtools are needed only for non-Haiku platforms.
+
+Anonymous checkout:
+```
+git clone https://git.haiku-os.org/haiku
+git clone https://git.haiku-os.org/buildtools
+```
+(You can also use the `git://` protocol, but it is not secure).
+
+If you have commit access:
+```
+git clone ssh://git.haiku-os.org/haiku
+git clone ssh://git.haiku-os.org/buildtools
+```
+
+Building Jam
+-------------------------------------------
+(*This step applies only to non-Haiku platforms.*)
+
+Change to the `buildtools` folder and run the following commands to
+generate and install `jam`:
+```
+cd buildtools/jam
+make
+sudo ./jam0 install
+```
+Or, if you don't want to install `jam` systemwide:
+```
+./jam0 -sBINDIR=$HOME/bin install
+```
+
+Configuring the build
+-------------------------------------
+The `configure` script generates a file named `BuildConfig` in the
+`generated/build` directory. As long as `configure` is not modified (!) and the
+cross-compilation tools have not been updated, there is no need to call it
again.
+For rebuilding, you only need to invoke `jam` (see below). If you don't
+update the source tree very frequently, you may want to execute `configure`
+after each update just to be on the safe side.
+
+Depending on your goal, there are several different ways to configure Haiku.
+You can either call configure from within your Haiku trunk folder. That will
+prepare a folder named 'generated', which will contain the compiled objects.
+Another option is to manually created one or more `generated.*` folders and run
+configure from within them. For example, imagine the following directory setup:
+```
+buildtools-trunk/
+haiku-trunk/
+haiku-trunk/generated.x86gcc2
+```
+
+### Configure a GCC 2.95 Hybrid, from a non-Haiku platform
+```bash
+cd haiku-trunk/generated.x86gcc2
+../configure --use-xattr-ref \
+ --build-cross-tools x86_gcc2 ../../buildtools/ \
+ --build-cross-tools x86
+```
+
+### Configure a GCC 2.95 Hybrid, from Haiku
+```
+cd haiku-trunk/generated.x86gcc2
+../configure --target-arch x86_gcc2 --target-arch x86
+```
+
+Additional information about GCC Hybrids can be found on the website,
+<https://haiku-os.org/guides/building/gcc-hybrid>.
+
+### Configure options
+The various runtime options for configure are documented in its onscreen help
+```bash
+./configure --help
+```
+
+Building via Jam
+----------------------------
+
+Haiku can be built in either of two ways, as disk image file (e.g. for use
+with emulators, to be written directly to a usb stick, burned as a compact
+disc) or as installation in a directory.
+
+### Running Jam
+
+There are various ways in which you can run `jam`:
+
+ * If you have a single generated folder, you can run 'jam' from the top level
of Haiku's trunk.
+ * If you have one or more generated folders, (e.g. generated.x86gcc2),
+ you can `cd` into that directory and run `jam`.
+ * In either case, you can `cd` into a certain folder in the source tree (e.g.
+ src/apps/debugger) and run jam -sHAIKU_OUTPUT_DIR=<path to generated folder>
+
+Be sure to read `build/jam/UserBuildConfig.ReadMe` and
`UserBuildConfig.sample`,
+as they contain information on customizing your build of Haiku.
+
+### Building a Haiku anyboot file
+```
+jam -q @anyboot-image
+```
+
+This generates an image file named `haiku-anyboot.image` in your output
+directory under `generated/`.
+
+### Building a VMware image file
+```
+jam -q @vmware-image
+```
+This generates an image file named `haiku.vmdk` in your output
+directory under `generated/`.
+
+### Directory Installation
+```
+HAIKU_INSTALL_DIR=/Haiku jam -q @install
+```
+
+Installs all Haiku components into the volume mounted at "/Haiku" and
+automatically marks it as bootable. To create a partition in the first place
+use DriveSetup and initialize it to BFS.
+
+Note that installing Haiku in a directory only works as expected under Haiku,
+but it is not yet supported under Linux and other non-Haiku platforms.
+
+### Building individual components
+If you don't want to build the complete Haiku, but only a certain
+app/driver/etc. you can specify it as argument to jam, e.g.:
+```
+jam -q Debugger
+```
+Alternatively, you can `cd` to the directory of the component you want to
+build and run `jam` from there. **NOTE:** if your generated directory is named
+something other than `generated/`, you will need to tell `jam` where it is:
+```
+jam -q -sHAIKU_OUTPUT_DIR=<path to generated folder>
+```
+You can also force the rebuild of a component by using the `-a` parameter:
+```
+jam -qa Debugger
+```
+
+Running
+----------------
+Generally there are two ways of running Haiku: on real hardware using a
+partition, and on emulated hardware using an emulator (like VirtualBox, or
QEMU).
+
+### On Real Hardware
+If you have installed Haiku to its own partition you can include this
+partition in your bootmanager and try to boot Haiku like any other OS you
+have installed. To include a new partition in the Haiku bootmanager, start
+the BootManager configurator by running:
+```
+BootManager
+```
+
+### On Emulated Hardware
+For emulated hardware you should build disk image (see above). How to set up
+this image depends on your emulator. If you use QEMU, you can usually just
+provide the path to the image as command line argument to the `qemu`
+executable.
############################################################################
Commit: 6eafb4b041ad79cb936b2041fdb9c56b1209cc10
URL: http://cgit.haiku-os.org/haiku/commit/?id=6eafb4b041ad
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jun 19 19:36:52 2015 UTC
Replace a few references to Subversion with Git.
There are a whole bunch more of these around, but these were the
ones I was confident replacing.
----------------------------------------------------------------------------
diff --git a/build/jam/UserBuildConfig.ReadMe b/build/jam/UserBuildConfig.ReadMe
index e3b13fc..0fd6ad3 100644
--- a/build/jam/UserBuildConfig.ReadMe
+++ b/build/jam/UserBuildConfig.ReadMe
@@ -2,7 +2,7 @@
# ----------------------
# UserBuildConfig can be used to customize the build according to your needs.
-# If existent it is included by the build system, but it is ignored by svn.
+# If existent it is included by the build system, but it is ignored by Git.
# This file documents a few examples, what can be done. Don't just rename it
# to UserBuildConfig -- you don't want all the things to happen, that are
# specified here. Rather create an empty UserBuildConfig and copy the lines
@@ -125,7 +125,7 @@ AddSourceDirectoryToHaikuImage src/tests/servers/debug :
alwaysUpdate ;
# Copy the jam sources (assuming they are located ../buildtools/jam relatively
# to your Haiku sources) to the image as /boot/home/Desktop/jam-src, excluding
-# any file or directory named ".svn" and any source path that matches the
+# any file or directory named ".git" and any source path that matches the
# pattern "*/jam/./bin.*". Note that the "*" character needs to be escaped with
# two backslashes (one because it goes through a shell and one to quote the
# first one in jam), and that the build system always appends "/." to the
source
@@ -134,7 +134,7 @@ AddSourceDirectoryToHaikuImage src/tests/servers/debug :
alwaysUpdate ;
# also be copied in update mode.
CopyDirectoryToHaikuImage home Desktop
: $(HAIKU_TOP)/../buildtools/jam
- : "jam-src" : -x .svn -X \\*/jam/./bin.\\* ;
+ : "jam-src" : -x .git -X \\*/jam/./bin.\\* ;
# Extracts the given archive onto the image under /boot/develop/tools.
ExtractArchiveToHaikuImage develop tools
diff --git a/data/config/boot/UserSetupEnvironment.sample
b/data/config/boot/UserSetupEnvironment.sample
index f263108..cdec764 100644
--- a/data/config/boot/UserSetupEnvironment.sample
+++ b/data/config/boot/UserSetupEnvironment.sample
@@ -1,12 +1,9 @@
-# Quick start for file UserSetupEnvironment. Copy or rename this file as
+# Quick start for file UserSetupEnvironment. Copy or rename this file as
# "/boot/home/config/boot/UserSetupEnvironment".
# Add custom environment variables to initialize
-# This file is a standard bash script. For more information regarding shell
+# This file is a standard bash script. For more information regarding shell
# scripts, refer to any online documentation for "bash scripting"
-# set Pe as the default svn editor for entering commit logs.
-# export SVN_EDITOR=lpe
-
# Set important variables
# export IS_COMPUTER_ON=1
diff --git a/src/system/libroot/os/system_revision.c
b/src/system/libroot/os/system_revision.c
index 08172c3..a4b00bd 100644
--- a/src/system/libroot/os/system_revision.c
+++ b/src/system/libroot/os/system_revision.c
@@ -7,7 +7,7 @@
#include <system_revision.h>
-// Haiku SVN revision. Will be set when copying libroot.so to the image.
+// Haiku revision (hrev). Will be set when copying libroot.so to the image.
// Lives in a separate section so that it can easily be found.
static char sHaikuRevision[SYSTEM_REVISION_LENGTH]
__attribute__((section("_haiku_revision")));
diff --git a/src/tools/checkstyle/checkstyle.py
b/src/tools/checkstyle/checkstyle.py
index 3cdcee1..64d5816 100644
--- a/src/tools/checkstyle/checkstyle.py
+++ b/src/tools/checkstyle/checkstyle.py
@@ -37,7 +37,7 @@ def run(fileSet, rules, outputFileName):
def visit(result, dir, names):
extensions = [".cpp", ".h"]
- names.remove(".svn")
+ names.remove(".git")
for name in names:
path = os.path.join(dir, name)
if os.path.isfile(path) and os.path.splitext(name)[1] in extensions:
############################################################################
Commit: 2e1e7847634fe2354ccede9951d53c8f2ea7a4b1
URL: http://cgit.haiku-os.org/haiku/commit/?id=2e1e7847634f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jun 19 19:39:50 2015 UTC
checkstyle: add #! line, fix filemode.
----------------------------------------------------------------------------
diff --git a/src/tools/checkstyle/checkstyle.py
b/src/tools/checkstyle/checkstyle.py
old mode 100644
new mode 100755
index 64d5816..fb581ef
--- a/src/tools/checkstyle/checkstyle.py
+++ b/src/tools/checkstyle/checkstyle.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
#
# Copyright 2009, Alexandre Deckner, alex@xxxxxxxxxxxx
# Distributed under the terms of the MIT License.
############################################################################
Commit: 1b5098018877f8e7980705b64abc650716cd93ad
URL: http://cgit.haiku-os.org/haiku/commit/?id=1b5098018877
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jun 19 19:40:40 2015 UTC
.gitignore: add .pyc and .pyo files.
----------------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 02456c5..9e9420d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,13 @@ generated*
build/jam/UserBuildConfig
build/user_config_headers
-# ignore KDE backup files ending with a ~
+# ignore KDE backup files ending with a ~
*~
# Vim swp files
.*.swp
conf.sh
+
+# compiled/optimized Python
+*.pyc
+*.pyo
############################################################################
Revision: hrev49311
Commit: d39c3c2b2fc538afd38ef1b0d5d99d42ff9a578d
URL: http://cgit.haiku-os.org/haiku/commit/?id=d39c3c2b2fc5
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jun 19 20:15:26 2015 UTC
accelerants/via: fix the build.
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/via/engine/Jamfile
b/src/add-ons/accelerants/via/engine/Jamfile
index 2f5b41c..e549846 100644
--- a/src/add-ons/accelerants/via/engine/Jamfile
+++ b/src/add-ons/accelerants/via/engine/Jamfile
@@ -5,6 +5,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics via ] ;
+SubDirCcFlags -Wno-unused ;
+
StaticLibrary libvia_engine.a :
acc.c
bes.c
diff --git a/src/add-ons/accelerants/via/engine/info.c
b/src/add-ons/accelerants/via/engine/info.c
index 0c419c0..e5815fa 100644
--- a/src/add-ons/accelerants/via/engine/info.c
+++ b/src/add-ons/accelerants/via/engine/info.c
@@ -19,7 +19,7 @@ static void pinsnv30_arch_fake(void);
static void getRAMsize(void);
static void getstrap_arch_nv4(void);
static void getstrap_arch_nv10_20_30_40(void);
-static status_t eng_crtc_setup_fifo(void);
+static status_t eng_crtc_setup_fifo(void);
/* Parse the BIOS PINS structure if there */
status_t parse_pins ()
@@ -249,7 +249,7 @@ static void detect_panels()
* -> On all cards a CRTC is used in slaved mode when a panel is
connected,
* except on NV11: here master mode is (might be?) detected. */
/* note also:
- * external TMDS encoders are only used for logic-level translation:
it's
+ * external TMDS encoders are only used for logic-level translation:
it's
* modeline registers are not used. Instead the GPU's internal modeline
registers
* are used. The external encoder is not connected to a I2C bus
(confirmed NV34). */
if (slaved_for_dev1 && !tvout1)
@@ -947,7 +947,7 @@ static void getRAMsize(void)
LOG(8,("INFO: unable to detect RAMsize (read $%02x),
assuming 16Mb\n"));
si->ps.memory_size = 16 * 1024 * 1024;
}
- }
+ }
}
static void getstrap_arch_nv4(void)
diff --git a/src/add-ons/kernel/drivers/graphics/via/Jamfile
b/src/add-ons/kernel/drivers/graphics/via/Jamfile
index 41fb9d1..141ba26 100644
--- a/src/add-ons/kernel/drivers/graphics/via/Jamfile
+++ b/src/add-ons/kernel/drivers/graphics/via/Jamfile
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers graphics via ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders graphics libroot ;
+UsePrivateHeaders graphics ;
+UsePrivateSystemHeaders ;
UsePrivateHeaders [ FDirName graphics via ] ;
KernelAddon via :
