We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch to get SDL running on OSTV

SDL_diff_OSTV.patch (text/plain), 13.14 KB, created by Sylvain on 2015-09-21 21:02:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2015-09-21 21:02:11 UTC

Size: 13.14 KB

patch

obsolete

>diff -r 63f03a567fe3 src/audio/coreaudio/SDL_coreaudio.c
>--- a/src/audio/coreaudio/SDL_coreaudio.c	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/audio/coreaudio/SDL_coreaudio.c	Mon Sep 21 22:55:20 2015 +0200
>@@ -679,10 +679,13 @@
>        You can change this at runtime in your own code if you need different
>        behavior.  If this is common, we can add an SDL hint for this.
>     */
>+#define TARGET_OSTV
>+#ifndef TARGET_OSTV
>     AudioSessionInitialize(NULL, NULL, NULL, nil);
>     UInt32 category = kAudioSessionCategory_AmbientSound;
>     AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(UInt32), &category);
> #endif
>+#endif
> 
>     impl->ProvidesOwnCallbackThread = 1;
> 
>diff -r 63f03a567fe3 src/joystick/iphoneos/SDL_sysjoystick.m
>--- a/src/joystick/iphoneos/SDL_sysjoystick.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/joystick/iphoneos/SDL_sysjoystick.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -36,7 +36,10 @@
> #include "../../events/SDL_events_c.h"
> #endif
> 
>+#define TARGET_OSTV
>+#ifndef TARGET_OSTV
> #import <CoreMotion/CoreMotion.h>
>+#endif
> 
> #ifdef SDL_JOYSTICK_MFI
> #import <GameController/GameController.h>
>@@ -46,7 +49,9 @@
> #endif /* SDL_JOYSTICK_MFI */
> 
> static const char *accelerometerName = "iOS Accelerometer";
>+#ifndef TARGET_OSTV
> static CMMotionManager *motionManager = nil;
>+#endif
> 
> static SDL_JoystickDeviceItem *deviceList = NULL;
> 
>@@ -351,6 +356,7 @@
> 
>     @autoreleasepool {
>         if (device->accelerometer) {
>+#ifndef TARGET_OSTV
>             if (motionManager == nil) {
>                 motionManager = [[CMMotionManager alloc] init];
>             }
>@@ -358,6 +364,7 @@
>             /* Shorter times between updates can significantly increase CPU usage. */
>             motionManager.accelerometerUpdateInterval = 0.1;
>             [motionManager startAccelerometerUpdates];
>+#endif
>         } else {
> #ifdef SDL_JOYSTICK_MFI
>             GCController *controller = device->controller;
>@@ -383,6 +390,7 @@
> {
>     const float maxgforce = SDL_IPHONE_MAX_GFORCE;
>     const SInt16 maxsint16 = 0x7FFF;
>+#ifndef TARGET_OSTV
>     CMAcceleration accel;
> 
>     @autoreleasepool {
>@@ -418,6 +426,7 @@
>     SDL_PrivateJoystickAxis(joystick, 0,  (accel.x / maxgforce) * maxsint16);
>     SDL_PrivateJoystickAxis(joystick, 1, -(accel.y / maxgforce) * maxsint16);
>     SDL_PrivateJoystickAxis(joystick, 2,  (accel.z / maxgforce) * maxsint16);
>+#endif
> }
> 
> #ifdef SDL_JOYSTICK_MFI
>@@ -538,6 +547,7 @@
> 
>     device->joystick = NULL;
> 
>+#ifndef TARGET_OSTV
>     @autoreleasepool {
>         if (device->accelerometer) {
>             [motionManager stopAccelerometerUpdates];
>@@ -548,12 +558,14 @@
> #endif
>         }
>     }
>+#endif
> }
> 
> /* Function to perform any system-specific joystick related cleanup */
> void
> SDL_SYS_JoystickQuit(void)
> {
>+#ifndef TARGET_OSTV
>     @autoreleasepool {
> #ifdef SDL_JOYSTICK_MFI
>         NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
>@@ -576,6 +588,7 @@
>         motionManager = nil;
>     }
> 
>+#endif
>     numjoysticks = 0;
> }
> 
>diff -r 63f03a567fe3 src/power/uikit/SDL_syspower.m
>--- a/src/power/uikit/SDL_syspower.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/power/uikit/SDL_syspower.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -20,6 +20,8 @@
> */
> #include "../../SDL_internal.h"
> 
>+#define TARGET_OSTV
>+
> #ifndef SDL_POWER_DISABLED
> #if SDL_POWER_UIKIT
> 
>@@ -37,6 +39,7 @@
> void
> SDL_UIKit_UpdateBatteryMonitoring(void)
> {
>+#ifndef TARGET_OSTV
>     if (SDL_UIKitLastPowerInfoQuery) {
>         if (SDL_TICKS_PASSED(SDL_GetTicks(), SDL_UIKitLastPowerInfoQuery + BATTERY_MONITORING_TIMEOUT)) {
>             UIDevice *uidev = [UIDevice currentDevice];
>@@ -45,11 +48,13 @@
>             SDL_UIKitLastPowerInfoQuery = 0;
>         }
>     }
>+#endif
> }
> 
> SDL_bool
> SDL_GetPowerInfo_UIKit(SDL_PowerState * state, int *seconds, int *percent)
> {
>+#ifndef TARGET_OSTV
>     @autoreleasepool {
>         UIDevice *uidev = [UIDevice currentDevice];
> 
>@@ -90,6 +95,30 @@
>         *percent = ( (level < 0.0f) ? -1 : ((int) ((level * 100) + 0.5f)) );
>         return SDL_TRUE; /* always the definitive answer on iOS. */
>     }
>+#else
>+    return SDL_FALSE;
>+#endif
>+}
>
>
> 
>diff -r 63f03a567fe3 src/video/uikit/SDL_uikitappdelegate.m
>--- a/src/video/uikit/SDL_uikitappdelegate.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/video/uikit/SDL_uikitappdelegate.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -20,6 +20,8 @@
> */
> #include "../../SDL_internal.h"
> 
>+#define TARGET_OSTV
>+
> #if SDL_VIDEO_DRIVER_UIKIT
> 
> #include "../SDL_sysvideo.h"
>@@ -80,9 +82,11 @@
> static UIImage *
> SDL_LoadLaunchImageNamed(NSString *name, int screenh)
> {
>+    UIImage *image = nil;
>+#ifndef TARGET_OSTV 
>     UIInterfaceOrientation curorient = [UIApplication sharedApplication].statusBarOrientation;
>     UIUserInterfaceIdiom idiom = [UIDevice currentDevice].userInterfaceIdiom;
>-    UIImage *image = nil;
>+
> 
>     if (idiom == UIUserInterfaceIdiomPhone && screenh == 568) {
>         /* The image name for the iPhone 5 uses its height as a suffix. */
>@@ -107,6 +111,7 @@
>             }
>         }
>     }
>+#endif
> 
>     if (!image) {
>         image = [UIImage imageNamed:name];
>@@ -141,7 +146,9 @@
> 
>     if (!self.view) {
>         NSArray *launchimages = [bundle objectForInfoDictionaryKey:@"UILaunchImages"];
>+#ifndef TARGET_OSTV
>         UIInterfaceOrientation curorient = [UIApplication sharedApplication].statusBarOrientation;
>+#endif
>         NSString *imagename = nil;
>         UIImage *image = nil;
> 
>@@ -158,7 +165,9 @@
>         /* Xcode 5 introduced a dictionary of launch images in Info.plist. */
>         if (launchimages) {
>             for (NSDictionary *dict in launchimages) {
>+#ifndef TARGET_OSTV
>                 UIInterfaceOrientationMask orientmask = UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown;
>+#endif
>                 NSString *minversion   = dict[@"UILaunchImageMinimumOSVersion"];
>                 NSString *sizestring   = dict[@"UILaunchImageSize"];
>                 NSString *orientstring = dict[@"UILaunchImageOrientation"];
>@@ -176,6 +185,7 @@
>                     }
>                 }
> 
>+#ifndef TARGET_OSTV
>                 if (orientstring) {
>                     if ([orientstring isEqualToString:@"PortraitUpsideDown"]) {
>                         orientmask = UIInterfaceOrientationMaskPortraitUpsideDown;
>@@ -192,7 +202,7 @@
>                 if ((orientmask & (1 << curorient)) == 0) {
>                     continue;
>                 }
>-
>+#endif
>                 imagename = dict[@"UILaunchImageName"];
>             }
> 
>@@ -215,6 +225,7 @@
>             UIImageView *view = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
>             UIImageOrientation imageorient = UIImageOrientationUp;
> 
>+#ifndef TARGET_OSTV
>             /* Bugs observed / workaround tested in iOS 8.3, 7.1, and 6.1. */
>             if (UIInterfaceOrientationIsLandscape(curorient)) {
>                 if (atleastiOS8 && image.size.width < image.size.height) {
>@@ -238,7 +249,7 @@
>                     }
>                 }
>             }
>-
>+#endif
>             /* Create the properly oriented image. */
>             view.image = [[UIImage alloc] initWithCGImage:image.CGImage scale:image.scale orientation:imageorient];
> 
>@@ -265,7 +276,11 @@
>     /* We keep the supported orientations unrestricted to avoid the case where
>      * there are no common orientations between the ones set in Info.plist and
>      * the ones set here (it will cause an exception in that case.) */
>+#ifndef TARGET_OSTV
>     return UIInterfaceOrientationMaskAll;
>+#else
>+    return 1;
>+#endif
> }
> 
> @end
>diff -r 63f03a567fe3 src/video/uikit/SDL_uikitmessagebox.m
>--- a/src/video/uikit/SDL_uikitmessagebox.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/video/uikit/SDL_uikitmessagebox.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -19,17 +19,19 @@
>   3. This notice may not be removed or altered from any source distribution.
> */
> #include "../../SDL_internal.h"
>-
>+#define TARGET_OSTV
> #if SDL_VIDEO_DRIVER_UIKIT
> 
> #include "SDL.h"
> #include "SDL_uikitvideo.h"
> 
> 
>+
> /* Display a UIKit message box */
> 
> static SDL_bool s_showingMessageBox = SDL_FALSE;
> 
>+#ifndef TARGET_OSTV
> @interface SDLAlertViewDelegate : NSObject <UIAlertViewDelegate>
> 
> @property (nonatomic, assign) int clickedIndex;
>@@ -44,7 +46,7 @@
> }
> 
> @end
>-
>+#endif
> 
> SDL_bool
> UIKit_ShowingMessageBox()
>@@ -55,6 +57,7 @@
> int
> UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
> {
>+#ifndef TARGET_OSTV
>     int i;
>     const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
> 
>@@ -87,7 +90,7 @@
> 
>         alert.delegate = nil;
>     }
>-
>+#endif
>     return 0;
> }
> 
>diff -r 63f03a567fe3 src/video/uikit/SDL_uikitmodes.m
>--- a/src/video/uikit/SDL_uikitmodes.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/video/uikit/SDL_uikitmodes.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -20,6 +20,8 @@
> */
> #include "../../SDL_internal.h"
> 
>+#define TARGET_OSTV
>+
> #if SDL_VIDEO_DRIVER_UIKIT
> 
> #include "SDL_assert.h"
>@@ -156,12 +158,16 @@
> SDL_bool
> UIKit_IsDisplayLandscape(UIScreen *uiscreen)
> {
>+#ifndef TARGET_OSTV
>     if (uiscreen == [UIScreen mainScreen]) {
>         return UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation);
>     } else {
>         CGSize size = uiscreen.bounds.size;
>         return (size.width > size.height);
>     }
>+#else 
>+    return 1;
>+#endif
> }
> 
> int
>diff -r 63f03a567fe3 src/video/uikit/SDL_uikitvideo.m
>--- a/src/video/uikit/SDL_uikitvideo.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/video/uikit/SDL_uikitvideo.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -162,7 +162,12 @@
>         /* The view should always show behind the status bar in iOS 7+. */
>         return screen.bounds;
>     } else {
>+#define TARGET_OSTV
>+#ifndef TARGET_OSTV
>         return screen.applicationFrame;
>+#else
>+        return screen.bounds;
>+#endif
>     }
> }
> 
>diff -r 63f03a567fe3 src/video/uikit/SDL_uikitview.m
>--- a/src/video/uikit/SDL_uikitview.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/video/uikit/SDL_uikitview.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -45,7 +86,10 @@
>         self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
>         self.autoresizesSubviews = YES;
> 
>+#define TARGET_OSTV
>+#ifndef TARGET_OSTV
>         self.multipleTouchEnabled = YES;
>+#endif
> 
>         touchId = 1;
>         SDL_AddTouch(touchId, "");
>diff -r 63f03a567fe3 src/video/uikit/SDL_uikitviewcontroller.h
>--- a/src/video/uikit/SDL_uikitviewcontroller.h	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/video/uikit/SDL_uikitviewcontroller.h	Mon Sep 21 22:55:20 2015 +0200
>@@ -47,9 +47,14 @@
> - (void)loadView;
> - (void)viewDidLayoutSubviews;
> - (NSUInteger)supportedInterfaceOrientations;
>+#define TARGET_OSTV
>+#ifndef TARGET_OSTV
> - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orient;
>+#endif
> - (BOOL)prefersStatusBarHidden;
>+#ifndef TARGET_OSTV
> - (UIStatusBarStyle)preferredStatusBarStyle;
>+#endif
> 
> #if SDL_IPHONE_KEYBOARD
> - (void)showKeyboard;
>diff -r 63f03a567fe3 src/video/uikit/SDL_uikitwindow.m
>--- a/src/video/uikit/SDL_uikitwindow.m	Mon Sep 21 21:19:37 2015 +0200
>+++ b/src/video/uikit/SDL_uikitwindow.m	Mon Sep 21 22:55:20 2015 +0200
>@@ -20,6 +20,8 @@
> */
> #include "../../SDL_internal.h"
> 
>+#define TARGET_OSTV
>+
> #if SDL_VIDEO_DRIVER_UIKIT
> 
> #include "SDL_syswm.h"
>@@ -107,6 +109,7 @@
>         window->flags |= SDL_WINDOW_BORDERLESS;  /* never has a status bar. */
>     }
> 
>+#ifndef TARGET_OSTV 
>     if (displaydata.uiscreen == [UIScreen mainScreen]) {
>         NSUInteger orients = UIKit_GetSupportedOrientations(window);
>         BOOL supportsLandscape = (orients & UIInterfaceOrientationMaskLandscape) != 0;
>@@ -119,6 +122,7 @@
>             height = temp;
>         }
>     }
>+#endif
> 
>     window->x = 0;
>     window->y = 0;
>@@ -190,6 +194,7 @@
>             }
>         }
> 
>+#ifndef TARGET_OSTV
>         if (data.uiscreen == [UIScreen mainScreen]) {
>             if (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
>                 [UIApplication sharedApplication].statusBarHidden = YES;
>@@ -197,6 +202,7 @@
>                 [UIApplication sharedApplication].statusBarHidden = NO;
>             }
>         }
>+#endif
> 
>         /* ignore the size user requested, and make a fullscreen window */
>         /* !!! FIXME: can we have a smaller view? */
>@@ -259,16 +265,20 @@
>     SDL_uikitviewcontroller *viewcontroller = data.viewcontroller;
> 
>     if (data.uiwindow.screen == [UIScreen mainScreen]) {
>+#ifndef TARGET_OSTV
>         if (window->flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS)) {
>             [UIApplication sharedApplication].statusBarHidden = YES;
>         } else {
>             [UIApplication sharedApplication].statusBarHidden = NO;
>         }
>+#endif
> 
>+#ifndef TARGET_OSTV
>         /* iOS 7+ won't update the status bar until we tell it to. */
>         if ([viewcontroller respondsToSelector:@selector(setNeedsStatusBarAppearanceUpdate)]) {
>             [viewcontroller setNeedsStatusBarAppearanceUpdate];
>         }
>+#endif
>     }
> 
>     /* Update the view's frame to account for the status bar change. */
>@@ -359,6 +369,7 @@
> NSUInteger
> UIKit_GetSupportedOrientations(SDL_Window * window)
> {
>+#ifndef TARGET_OSTV 
>     const char *hint = SDL_GetHint(SDL_HINT_ORIENTATIONS);
>     NSUInteger validOrientations = UIInterfaceOrientationMaskAll;
>     NSUInteger orientationMask = 0;
>@@ -420,6 +431,9 @@
>     }
> 
>     return orientationMask;
>+#else
>+    return 1;
>+#endif
> }
> 
> int

Actions: View | Diff

Attachments on bug 3126: 2270

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.