hrev50459 adds 4 changesets to branch 'master'
old head: 40ae563fa1552e5dcde710671dbb2caad7b9b6b9
new head: b070edd867ab1ace6f93fd45e156625ce3433039
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=b070edd867ab+%5E40ae563fa155
----------------------------------------------------------------------------
a3e794ae459f: be_apps/Deskbar: Remove.
The only file in here was Deskbar.h, which just included the "real"
Deskbar.h. Considering nothing in-tree cares about this, and only
a small number of applications at HaikuArchives do, and that Haiku already
broke BeOS source compatibility in lots of other ways, let's just remove
this deprecated cruft.
2381f8276aa3: be_apps/ServicesDaemon: Remove.
The last reference to the Services Daemon, which was removed from the
tree a while back (the launch_daemon has supplanted it).
48440e694506: headers/libs/mesa: Remove.
Unused, as far as I can tell, and not installed. (Grok returns 0 results
for "glcore.h" and 0 relevant results for "mesa".)
b070edd867ab: packages/HaikuDevel: Add GLUT header to image.
We've shipped libglut.so since a long time ago, so let's ship the header
too. Fixes #11739.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 2 insertions(+), 198 deletions(-)
build/jam/packages/HaikuDevel | 1 +
data/system/boot/SetupEnvironment | 2 +-
headers/libs/mesa/GL/internal/glcore.h | 179 -------------------
headers/os/be_apps/Deskbar/Deskbar.h | 6 -
.../os/be_apps/ServicesDaemon/ServicesDaemon.h | 12 --
############################################################################
Commit: a3e794ae459fec76826407f8ba8c94cd3535f128
URL: http://cgit.haiku-os.org/haiku/commit/?id=a3e794ae459f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jul 29 22:21:13 2016 UTC
be_apps/Deskbar: Remove.
The only file in here was Deskbar.h, which just included the "real"
Deskbar.h. Considering nothing in-tree cares about this, and only
a small number of applications at HaikuArchives do, and that Haiku already
broke BeOS source compatibility in lots of other ways, let's just remove
this deprecated cruft.
----------------------------------------------------------------------------
diff --git a/data/system/boot/SetupEnvironment
b/data/system/boot/SetupEnvironment
index 480a824..d444e0b 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -21,7 +21,7 @@ esac
# not used by Haiku, but by (legacy) applications (e.g. Pe)
BH=$BUILDHOME/headers
-BEINCLUDES="$BH;$BH/be;$BH/posix;$BH/glibc;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/locale;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/Deskbar;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker"
+BEINCLUDES="$BH;$BH/be;$BH/posix;$BH/glibc;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/locale;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker"
export BUILDHOME
export BEINCLUDES
diff --git a/headers/os/be_apps/Deskbar/Deskbar.h
b/headers/os/be_apps/Deskbar/Deskbar.h
deleted file mode 100644
index 6645493..0000000
--- a/headers/os/be_apps/Deskbar/Deskbar.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _DESKBAR_H
-// I don't know why this file exists in addition to the one we include
-// below, but who cares... (originally, in R5, both files exist and are
-// identical).
-# include <interface/Deskbar.h>
-#endif
############################################################################
Commit: 2381f8276aa35e7b6f4840724bb3669149df54c6
URL: http://cgit.haiku-os.org/haiku/commit/?id=2381f8276aa3
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jul 29 22:23:46 2016 UTC
be_apps/ServicesDaemon: Remove.
The last reference to the Services Daemon, which was removed from the
tree a while back (the launch_daemon has supplanted it).
----------------------------------------------------------------------------
diff --git a/headers/os/be_apps/ServicesDaemon/ServicesDaemon.h
b/headers/os/be_apps/ServicesDaemon/ServicesDaemon.h
deleted file mode 100644
index 6d1c862..0000000
--- a/headers/os/be_apps/ServicesDaemon/ServicesDaemon.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef SERVICES_DAEMON_APP_H
-#define SERVICES_DAEMON_APP_H
-
-#define B_SERVICES_DAEMON_SIGNATURE "application/x-vnd.Haiku-ServicesDaemon"
-
-// Send this message to the daemon if you would like to have your program
-// restarted. The message is expected to have an attached string containing
-// the signature of your app. Once sent to the daemon, it will wait until
-// your app quits before relaunching it.
-#define B_SERVICES_DAEMON_RESTART 'SDRS'
-
-#endif
############################################################################
Commit: 48440e69450601e2e0a2d9e5f9874dda1e4b3101
URL: http://cgit.haiku-os.org/haiku/commit/?id=48440e694506
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jul 29 22:31:33 2016 UTC
headers/libs/mesa: Remove.
Unused, as far as I can tell, and not installed. (Grok returns 0 results
for "glcore.h" and 0 relevant results for "mesa".)
----------------------------------------------------------------------------
diff --git a/headers/libs/mesa/GL/internal/glcore.h
b/headers/libs/mesa/GL/internal/glcore.h
deleted file mode 100644
index 99de6c0..0000000
--- a/headers/libs/mesa/GL/internal/glcore.h
+++ /dev/null
@@ -1,179 +0,0 @@
-#ifndef __gl_core_h_
-#define __gl_core_h_
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-#include <sys/types.h>
-
-#define GL_CORE_SGI 1
-#define GL_CORE_MESA 2
-#define GL_CORE_APPLE 4
-#define GL_CORE_WINDOWS 8
-
-typedef struct __GLcontextRec __GLcontext;
-
-/*
-** This file defines the interface between the GL core and the surrounding
-** "operating system" that supports it (currently the GLX or WGL extensions).
-**
-** Members (data and function pointers) are documented as imported or
-** exported according to how they are used by the core rendering functions.
-** Imported members are initialized by the "operating system" and used by
-** the core functions. Exported members are initialized by the core functions
-** and used by the "operating system".
-*/
-
-/**
- * Mode and limit information for a context. This information is
- * kept around in the context so that values can be used during
- * command execution, and for returning information about the
- * context to the application.
- *
- * Instances of this structure are shared by the driver and the loader. To
- * maintain binary compatability, new fields \b must be added only to the
- * end of the structure.
- *
- * \sa _gl_context_modes_create
- */
-typedef struct __GLcontextModesRec {
- struct __GLcontextModesRec * next;
-
- GLboolean rgbMode;
- GLboolean floatMode;
- GLboolean colorIndexMode;
- GLuint doubleBufferMode;
- GLuint stereoMode;
-
- GLboolean haveAccumBuffer;
- GLboolean haveDepthBuffer;
- GLboolean haveStencilBuffer;
-
- GLint redBits, greenBits, blueBits, alphaBits; /* bits per comp */
- GLuint redMask, greenMask, blueMask, alphaMask;
- GLint rgbBits; /* total bits for rgb */
- GLint indexBits; /* total bits for colorindex */
-
- GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;
- GLint depthBits;
- GLint stencilBits;
-
- GLint numAuxBuffers;
-
- GLint level;
-
- GLint pixmapMode;
-
- /* GLX */
- GLint visualID;
- GLint visualType; /**< One of the GLX X visual types. (i.e.,
- * \c GLX_TRUE_COLOR, etc.)
- */
-
- /* EXT_visual_rating / GLX 1.2 */
- GLint visualRating;
-
- /* EXT_visual_info / GLX 1.2 */
- GLint transparentPixel;
- /* colors are floats scaled to ints */
- GLint transparentRed, transparentGreen, transparentBlue, transparentAlpha;
- GLint transparentIndex;
-
- /* ARB_multisample / SGIS_multisample */
- GLint sampleBuffers;
- GLint samples;
-
- /* SGIX_fbconfig / GLX 1.3 */
- GLint drawableType;
- GLint renderType;
- GLint xRenderable;
- GLint fbconfigID;
-
- /* SGIX_pbuffer / GLX 1.3 */
- GLint maxPbufferWidth;
- GLint maxPbufferHeight;
- GLint maxPbufferPixels;
- GLint optimalPbufferWidth; /* Only for SGIX_pbuffer. */
- GLint optimalPbufferHeight; /* Only for SGIX_pbuffer. */
-
- /* SGIX_visual_select_group */
- GLint visualSelectGroup;
-
- /* OML_swap_method */
- GLint swapMethod;
-
- GLint screen;
-
- /* EXT_texture_from_pixmap */
- GLint bindToTextureRgb;
- GLint bindToTextureRgba;
- GLint bindToMipmapTexture;
- GLint bindToTextureTargets;
- GLint yInverted;
-} __GLcontextModes;
-
-/* Several fields of __GLcontextModes can take these as values. Since
- * GLX header files may not be available everywhere they need to be used,
- * redefine them here.
- */
-#define GLX_NONE 0x8000
-#define GLX_SLOW_CONFIG 0x8001
-#define GLX_TRUE_COLOR 0x8002
-#define GLX_DIRECT_COLOR 0x8003
-#define GLX_PSEUDO_COLOR 0x8004
-#define GLX_STATIC_COLOR 0x8005
-#define GLX_GRAY_SCALE 0x8006
-#define GLX_STATIC_GRAY 0x8007
-#define GLX_TRANSPARENT_RGB 0x8008
-#define GLX_TRANSPARENT_INDEX 0x8009
-#define GLX_NON_CONFORMANT_CONFIG 0x800D
-#define GLX_SWAP_EXCHANGE_OML 0x8061
-#define GLX_SWAP_COPY_OML 0x8062
-#define GLX_SWAP_UNDEFINED_OML 0x8063
-
-#define GLX_DONT_CARE 0xFFFFFFFF
-
-#define GLX_RGBA_BIT 0x00000001
-#define GLX_COLOR_INDEX_BIT 0x00000002
-#define GLX_WINDOW_BIT 0x00000001
-#define GLX_PIXMAP_BIT 0x00000002
-#define GLX_PBUFFER_BIT 0x00000004
-
-#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
-#define GLX_Y_INVERTED_EXT 0x20D4
-
-#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
-
-#endif /* __gl_core_h_ */
############################################################################
Revision: hrev50459
Commit: b070edd867ab1ace6f93fd45e156625ce3433039
URL: http://cgit.haiku-os.org/haiku/commit/?id=b070edd867ab
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jul 29 22:37:56 2016 UTC
Ticket: https://dev.haiku-os.org/ticket/11739
packages/HaikuDevel: Add GLUT header to image.
We've shipped libglut.so since a long time ago, so let's ship the header
too. Fixes #11739.
----------------------------------------------------------------------------
diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel
index 6bdee11..8ecf66e 100644
--- a/build/jam/packages/HaikuDevel
+++ b/build/jam/packages/HaikuDevel
@@ -50,6 +50,7 @@ AddFilesToPackage develop lib : libposix_error_mapper.a ;
AddHeaderDirectoryToPackage config ;
AddHeaderDirectoryToPackage glibc ;
AddHeaderDirectoryToPackage libs alm ;
+AddHeaderDirectoryToPackage libs glut GL ;
AddHeaderDirectoryToPackage os ;
AddHeaderDirectoryToPackage posix ;
