diff options
Diffstat (limited to 'tools')
57 files changed, 65 insertions, 4258 deletions
diff --git a/tools/EventClients/Clients/J2ME Client/README b/tools/EventClients/Clients/J2ME Client/README deleted file mode 100644 index ee1426812c..0000000000 --- a/tools/EventClients/Clients/J2ME Client/README +++ /dev/null @@ -1,23 +0,0 @@ -1. Can I use it? -To use the J2ME client only CLDC 1.0 and MIDP 1.0 is needed. -The client will also need bluetooth and must be able to initialize the connection. - -2. Compiling the client -To compile the J2ME Application some libraries are needed: - *Suns Wireless Toolkit - *Java - *Ant -Before it can be compiled the link to Suns Wireless Toolkit are needed and are in build.xml -under <property name="WTK" value=""> where the value should be the path to the toolkit. -When compiling in ubuntu all that is needed are the following command -# ant -The final jar file will end up in build/release/ -For installations on some J2ME devices a jad file is needed and it needs the correct filesize of the JAR. This is not an -automated process and thus open the build/release/XBMCRemote.jad and alter it is requiered. The filesize is in bytes -and reflects that of build/release/XBMCRemote.jar - -3. Pre Usage -To use the EventClient you'll need to run the EventClient on a computer by: -# python XBMCJ2ME.py -It depends on Pybluez (http://org.csail.mit.edu/pybluez/) and is available in repository -# sudo apt-get install python-bluetooth diff --git a/tools/EventClients/Clients/J2ME Client/build.xml b/tools/EventClients/Clients/J2ME Client/build.xml deleted file mode 100644 index 4e583b21bc..0000000000 --- a/tools/EventClients/Clients/J2ME Client/build.xml +++ /dev/null @@ -1,31 +0,0 @@ -<project name="XBMC Remote" default="make"> - <property name="WTK" value=""/> - <property name="OUTNAME" value="XBMCRemote"/> - <property name="MIDP10_LIB" value="${WTK}/lib/midpapi10.jar"/> - <property name="CLDC10_LIB" value="${WTK}/lib/cldcapi10.jar"/> - <property name="JSR082_LIB" value="${WTK}/lib/jsr082.jar"/> - <property name="ALL_LIB" value="${MIDP10_LIB}:${CLDC10_LIB}:${JSR082_LIB}"/> - - <target name="compile"> - <tstamp/> - <mkdir dir="build/compiled"/> - <javac destdir="build/compiled" srcdir="src" bootclasspath="${ALL_LIB}" target="1.1"/> - </target> - - <target name="preverify" depends="compile"> - <mkdir dir="build/preverified"/> - <exec executable="${WTK}/bin/preverify"> - <arg line="-classpath ${ALL_LIB}"/> - <arg line="-d build/preverified"/> - <arg line="build/compiled"/> - </exec> - </target> - - <target name="make" depends="preverify"> - <mkdir dir="build/release"/> - <jar basedir="build/preverified" jarfile="build/release/${OUTNAME}.jar" manifest="manifest.mf"> - <fileset dir="icons"/> - </jar> - <copy file="src/XBMCRemote.jad" tofile="build/release/${OUTNAME}.jad"/> - </target> -</project> diff --git a/tools/EventClients/Clients/J2ME Client/icons/icon.png b/tools/EventClients/Clients/J2ME Client/icons/icon.png Binary files differdeleted file mode 100644 index 812237b3ac..0000000000 --- a/tools/EventClients/Clients/J2ME Client/icons/icon.png +++ /dev/null diff --git a/tools/EventClients/Clients/J2ME Client/j2me_remote.py b/tools/EventClients/Clients/J2ME Client/j2me_remote.py deleted file mode 100755 index b963a87a79..0000000000 --- a/tools/EventClients/Clients/J2ME Client/j2me_remote.py +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/python -# -# XBMC Media Center -# J2ME Remote -# Copyright (c) 2008 topfs2 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -import sys -try: - from kodi.xbmcclient import * - from kodi.bt.bt import * - from kodi.defs import * -except: - sys.path.append('../../lib/python') - from xbmcclient import * - from bt.bt import * - ICON_PATH = "../../icons/" - -from socket import * -import os -from threading import Thread - -host = "localhost" -port = 9777 -addr = (host, port) -sock = socket(AF_INET,SOCK_DGRAM) - -def send_key(key): - packet = PacketBUTTON(map_name="JS0:J2ME", code=key, repeat=0, queue=0) - packet.send(sock, addr) - -def send_message(caption, msg): - packet = PacketNOTIFICATION(caption, - msg, - ICON_PNG, - icon_file=ICON_PATH + "/phone.png") - - packet.send(sock, addr) - -def send_ImageToBluetooth(Image): - imageData = file( Image ).read() - print "Data len ", len( imageData ) - client_sock.send( format.uint32( len( imageData) ) ) - client_sock.sendall(imageData) - print "Sent file" - -class Ping(Thread): - def __init__ (self): - Thread.__init__(self) - def run(self): - import time - while 1: # ping the server every 19s - packet = PacketPING() - packet.send(sock, addr) - time.sleep (19) - -def main(): - import time - - # connect to localhost, port 9777 using a UDP socket - # this only needs to be done once. - # by default this is where XBMC will be listening for incoming - # connections. - server_sock=bt_create_rfcomm_socket() - server_sock.listen(2) - - portBT = server_sock.getsockname()[1] - - uuid = "ACDC" - bt_advertise(socket=server_sock, name="XBMC Remote", uuid=uuid) - - print "Waiting for connection on RFCOMM channel %d" % portBT - - packet = PacketHELO(devicename="J2ME Remote", - icon_type=ICON_PNG, - icon_file=ICON_PATH + "/phone.png") - packet.send(sock, addr) - Ping().start() - while(True): - try: - client_sock, client_info = server_sock.accept() - print "Accepted connection from ", client_info - client_addr, client_port = client_info - runFlag = True - firstRun = True - print "Accepted connection from ", client_addr - except KeyboardInterrupt: - packet = PacketLOG(LOGNOTICE, "J2ME: User interrupted") - packet.send(sock, addr) - bt_stop_advertising(socket = server_sock) - server_sock.close() - sys.exit(0) - try: - while runFlag: - if firstRun: - client_name = client_sock.recv(1024) - firstRun = False - send_message("J2ME: Phone Connected", client_name) - packet = PacketLOG(LOGNOTICE, "Phone Connected") - packet.send(sock, addr) - data = client_sock.recv(3) - if(data[0] == "0"): - if(data[1] == "0"): - runFlag = False - packet = PacketLOG(LOGNOTICE, "J2ME: Recieved disconnect command") - packet.send(sock, addr) - client_sock.close() - if(data[1] == "1"): - print "Shuting down server" - client_sock.close() - bt_stop_advertising(socket = server_sock) - server_sock.close() - packet = PacketBYE() - packet.send(sock, addr) - sys.exit(0) - - elif(data[0] == "2"): - print "<button id=\"%i\">" % ord( data[1] ) - send_key(ord( data[1] ) ) - else: - print "Unkown received data [%s]" % data - except IOError: - print "Lost connection too %s" % client_name - runFlag = False - send_message("Phone Disconnected", client_name) - pass - except KeyboardInterrupt: - packet = PacketLOG(LOGNOTICE, "J2ME: User interrupted") - packet.send(sock, addr) - client_sock.close() - bt_stop_advertising(socket = server_sock) - server_sock.close() - packet = PacketBYE() # PacketPING if you want to ping - packet.send(sock, addr) - sys.exit(0) - -def usage(): - print """ -Java Bluetooth Phone Remote Control Client for XBMC v0.1 - -Usage for xbmcphone.py - --address ADDRESS (default: localhost) - --port PORT (default: 9777) - --help (Brings up this message) -""" - -if __name__=="__main__": - try: - i = 0 - while (i < len(sys.argv)): - if (sys.argv[i] == "--address"): - host = sys.argv[i + 1] - elif (sys.argv[i] == "--port"): - port = sys.argv[i + 1] - elif (sys.argv[i] == "--help"): - usage() - sys.exit(0) - i = i + 1 - main() - except: - sys.exit(0) diff --git a/tools/EventClients/Clients/J2ME Client/manifest.mf b/tools/EventClients/Clients/J2ME Client/manifest.mf deleted file mode 100644 index 49cddf5c28..0000000000 --- a/tools/EventClients/Clients/J2ME Client/manifest.mf +++ /dev/null @@ -1,7 +0,0 @@ -MIDlet-1: MainScreen, , MainScreen -MIDlet-Vendor: team-xbmc -MIDlet-Name: XBMC Remote -MIDlet-Icon: icon.png -MIDlet-Version: 0.1 -MicroEdition-Configuration: CLDC-1.0 -MicroEdition-Profile: MIDP-1.0 diff --git a/tools/EventClients/Clients/J2ME Client/src/BluetoothCommunicator.java b/tools/EventClients/Clients/J2ME Client/src/BluetoothCommunicator.java deleted file mode 100644 index 2db3f54dd2..0000000000 --- a/tools/EventClients/Clients/J2ME Client/src/BluetoothCommunicator.java +++ /dev/null @@ -1,228 +0,0 @@ -/* -* XBMC Media Center -* UDP Event Server -* Copyright (c) 2008 topfs2 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -import javax.microedition.io.Connector; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import javax.microedition.io.StreamConnection; -import java.lang.NullPointerException; -import java.util.Vector; -import javax.bluetooth.*; -import javax.bluetooth.LocalDevice; -import javax.microedition.lcdui.Form; -import javax.microedition.lcdui.Image; -import javax.microedition.lcdui.Display; -import java.lang.*; - -public class BluetoothCommunicator extends Thread -{ - private boolean Run; - private Form Log; - private BluetoothEvent recvEvent; - - protected static String Address = null; - private static StreamConnection Connection = null; - private static DataInputStream inputStream = null; - private static DataOutputStream outputStream = null; - - public BluetoothCommunicator(BluetoothEvent recvEvent, Form Log) - { - this.recvEvent = recvEvent; - this.Log = Log; - } - - public static boolean Connect(Form Log, String addr) - { - Log.append("Going to connect\n"); - try - { - Connection = (StreamConnection)Connector.open(addr); - - if (Connection == null) - { - Log.append("Connector.open returned null\n"); - return false; - } - else - { - Log.append("Connector.open returned connection\n"); - inputStream = Connection.openDataInputStream(); - outputStream = Connection.openDataOutputStream(); - Address = addr; - return true; - } - } - catch (Exception e) - { - Log.append("Exception" + e.getMessage() + "\n"); - try - { - if (Connection != null) - Connection.close(); - } - catch (Exception ee) - { - Log.append("Exception " + ee.getMessage() + "\n"); - } - Connection = null; - return false; - } - } - - public static boolean Handshake(Form Log, Display disp) - { - if (Connection == null) - return false; - try - { - LocalDevice localDevice = LocalDevice.getLocalDevice(); - Send(localDevice.getFriendlyName()); - - return true; - } - catch(NullPointerException NPE) - { - Log.append("Null " + NPE.getMessage()); - } - catch (IndexOutOfBoundsException IOBE) - { - Log.append("IndexOutOfBounds " + IOBE.getMessage()); - } - catch (IllegalArgumentException IAE) - { - Log.append("illegalArg " + IAE.getMessage()); - } - catch(Exception e) - { - Log.append("Exception in handshake " + e.getMessage()); - } - return false; - } - public void run() - { - Run = true; - while (Run) - { - try - { - if (inputStream.available() <= 0) - sleep(10); - else - { - Log.append("run:Ava " + inputStream.available() + "\n"); - byte []b = new byte[1]; - b[0] = (byte)255; // safe thing for now - inputStream.read(b, 0, 1); - byte[] recv = null; - switch (b[0]) - { - case BluetoothEvent.RECV_SYSTEM: - recv = new byte[]{ inputStream.readByte() }; - break; - case BluetoothEvent.RECV_COMMAND: - recv = new byte[]{ inputStream.readByte() }; - break; - case BluetoothEvent.RECV_IMAGE: - Log.append("Recv_Image\n"); - recv = RecvImage(Log); - break; - } - if (recv != null) - recvEvent.Recv(b[0], recv); - } - } - catch (Exception e) - { - Log.append("RecvException " + e.getMessage()); - } - } - } - public void close() - { - Run = false; - } - public static byte[] RecvImage(Form Log) - { - try - { - int length = inputStream.readInt(); - Log.append("readUnsignedShort: " + length + "\n"); - byte[] arrayToUse = new byte[length]; - inputStream.readFully(arrayToUse, 0, length); - return arrayToUse; - } - catch (Exception e ) - { - Log.append("Exception RecvImage " + e.getMessage()); - return null; - } - } - - public static int Recv(byte[] arrayToUse, Form Log ) - { - if (Connection == null) - return -1; - try - { - return inputStream.read(arrayToUse); - } - catch (Exception e) - { - Log.append("Exception in Recv " + e.getMessage()); - return -1; - } - } - - public static boolean Send(byte[] packet) - { - if (Connection == null) - return false; - try - { - outputStream.write(packet, 0, packet.length); - return true; - } - catch (Exception e) - { - return false; - } - } - - public static boolean Send(String packet) - { - return Send(packet.getBytes()); - } - - public static void Disconnect() - { - if (Connection == null) - return; - - try - { - byte[] packet = { '0', '0' }; - Send(packet); - Connection.close(); - } - catch (Exception e) - { } - - Connection = null; - } -} diff --git a/tools/EventClients/Clients/J2ME Client/src/BluetoothEvent.java b/tools/EventClients/Clients/J2ME Client/src/BluetoothEvent.java deleted file mode 100644 index 6557dca2e0..0000000000 --- a/tools/EventClients/Clients/J2ME Client/src/BluetoothEvent.java +++ /dev/null @@ -1,27 +0,0 @@ -/* -* XBMC Media Center -* UDP Event Server -* Copyright (c) 2008 topfs2 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -public interface BluetoothEvent { - public final int RECV_SYSTEM = 0; - public final int RECV_COMMAND = 1; - public final int RECV_IMAGE = 2; - - // The header is a byte IRL. 0 - 255 and tells packet type - public void Recv(int Header, byte[] Payload); -} diff --git a/tools/EventClients/Clients/J2ME Client/src/BluetoothServiceDiscovery.java b/tools/EventClients/Clients/J2ME Client/src/BluetoothServiceDiscovery.java deleted file mode 100644 index 3ff71f13f2..0000000000 --- a/tools/EventClients/Clients/J2ME Client/src/BluetoothServiceDiscovery.java +++ /dev/null @@ -1,126 +0,0 @@ -/* -* XBMC Media Center -* UDP Event Server -* Copyright (c) 2008 topfs2 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -import java.util.Vector; -import javax.bluetooth.DeviceClass; -import javax.bluetooth.DiscoveryAgent; -import javax.bluetooth.DiscoveryListener; -import javax.bluetooth.LocalDevice; -import javax.bluetooth.RemoteDevice; -import javax.bluetooth.ServiceRecord; -import javax.bluetooth.UUID; - -import javax.microedition.lcdui.*; - -public class BluetoothServiceDiscovery implements DiscoveryListener -{ - private static Object lock=new Object(); - private static Vector vecDevices=new Vector(); - private static String connectionURL=null; - - public static String Scan(Form Log, String ScanForUUID) throws Exception - { - BluetoothServiceDiscovery bluetoothServiceDiscovery=new BluetoothServiceDiscovery(); - //display local device address and name - LocalDevice localDevice = LocalDevice.getLocalDevice(); - //find devices - DiscoveryAgent agent = localDevice.getDiscoveryAgent(); - - agent.startInquiry(DiscoveryAgent.GIAC, bluetoothServiceDiscovery); - try - { - synchronized(lock) - { lock.wait(); } - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - Log.append("Device Inquiry Completed. \n"); - - int deviceCount=vecDevices.size(); - if(deviceCount <= 0) - { - Log.append("No Devices Found .\n"); - return null; - } - else - { - Log.append("Bluetooth Devices: \n"); - for (int i = 0; i <deviceCount; i++) - { - RemoteDevice remoteDevice=(RemoteDevice)vecDevices.elementAt(i); - String t = i + ": \"" + remoteDevice.getFriendlyName(true) + "\""; - Log.append(t + "\n"); - } - } - UUID[] uuidSet = new UUID[1]; - if (ScanForUUID != null) - uuidSet[0]=new UUID(ScanForUUID, true); - else - uuidSet[0]=new UUID("ACDC", true); - - for (int i = 0; i < vecDevices.capacity(); i++) - { - RemoteDevice remoteDevice=(RemoteDevice)vecDevices.elementAt(i); - String t = remoteDevice.getFriendlyName(true); - agent.searchServices(null,uuidSet,remoteDevice,bluetoothServiceDiscovery); - try - { - synchronized(lock) - { lock.wait(); } - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - if(connectionURL != null) - return connectionURL; - } - Log.append("Couldn't find any computer that were suitable\n"); - return null; - } - - public void deviceDiscovered(RemoteDevice btDevice, DeviceClass cod) - { - if(!vecDevices.contains(btDevice)) - vecDevices.addElement(btDevice); - } - - public void servicesDiscovered(int transID, ServiceRecord[] servRecord) - { - if(servRecord!=null && servRecord.length>0){ - connectionURL=servRecord[0].getConnectionURL(0,false); - } - synchronized(lock) - { lock.notify(); } - } - - public void serviceSearchCompleted(int transID, int respCode) - { - synchronized(lock) - { lock.notify(); } - } - - public void inquiryCompleted(int discType) - { - synchronized(lock) - { lock.notify(); } - } -} diff --git a/tools/EventClients/Clients/J2ME Client/src/KeyCanvas.java b/tools/EventClients/Clients/J2ME Client/src/KeyCanvas.java deleted file mode 100644 index 8c2153c0d6..0000000000 --- a/tools/EventClients/Clients/J2ME Client/src/KeyCanvas.java +++ /dev/null @@ -1,66 +0,0 @@ -/* -* XBMC Media Center -* UDP Event Server -* Copyright (c) 2008 topfs2 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -import javax.microedition.lcdui.*; - -public class KeyCanvas extends Canvas -{ - private KeyHandler m_SendKey = null; - private Image Cover = null; - private boolean SetCover = false; - - public KeyCanvas(KeyHandler sendKey) - { - m_SendKey = sendKey; - try - { -// Cover = Image.createImage("home.png"); - } - catch (Exception e) - { } - } - - public void SetCover(Image newCover) - { - if (newCover != null) - { - SetCover = true; - Cover = newCover; - } - } - - public void paint(Graphics g) - { - g.drawRect(0, 0, this.getWidth(), this.getHeight()); - if (Cover != null) - g.drawImage(Cover, 0, 0, g.TOP|g.LEFT); - } - - public void keyPressed(int keyCode) - { - if (m_SendKey != null) - m_SendKey.keyPressed(keyCode); - } - - public void keyRepeated(int keyCode) - { - if (m_SendKey != null) - m_SendKey.keyPressed(keyCode); - } -} diff --git a/tools/EventClients/Clients/J2ME Client/src/KeyHandler.java b/tools/EventClients/Clients/J2ME Client/src/KeyHandler.java deleted file mode 100644 index a6a5ac10d0..0000000000 --- a/tools/EventClients/Clients/J2ME Client/src/KeyHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -/* -* XBMC Media Center -* UDP Event Server -* Copyright (c) 2008 topfs2 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -public interface KeyHandler -{ - public void keyPressed(int keyCode); -} diff --git a/tools/EventClients/Clients/J2ME Client/src/MainScreen.java b/tools/EventClients/Clients/J2ME Client/src/MainScreen.java deleted file mode 100644 index 2e68c7d211..0000000000 --- a/tools/EventClients/Clients/J2ME Client/src/MainScreen.java +++ /dev/null @@ -1,271 +0,0 @@ -/* -* XBMC Media Center -* UDP Event Server -* Copyright (c) 2008 topfs2 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -import java.util.Vector; -import javax.bluetooth.DeviceClass; -import javax.bluetooth.DiscoveryAgent; -import javax.bluetooth.DiscoveryListener; -import javax.bluetooth.LocalDevice; -import javax.bluetooth.RemoteDevice; -import javax.bluetooth.ServiceRecord; -import javax.bluetooth.UUID; - -import javax.microedition.midlet.*; -import javax.microedition.lcdui.*; - -public class MainScreen extends MIDlet implements CommandListener, KeyHandler, BluetoothEvent -{ - private boolean LogActive = true; - private final int VersionMajor = 0; - private final int VersionMinor = 1; - private final String Version = (VersionMajor + "." + VersionMinor); - - private final Command CMD_OK = new Command("OK", Command.OK, 1); - private final Command CMD_CONNECT = new Command("Connect", Command.OK, 1); - private final Command CMD_DISCONNECT = new Command("Disconnect", Command.CANCEL, 1); - private final Command CMD_EXIT = new Command("Exit", Command.CANCEL, 1); - private final Command CMD_LOG = new Command("Log", Command.OK, 1); - private final Command CMD_SHOWREMOTE = new Command("Remote", Command.OK, 1); - private Display display; - private Form MainForm; - - private KeyCanvas keyHandler; - private BluetoothCommunicator RecvThread; - - private final int CONNECTED = 1; - private final int NOT_CONNECTED = -1; - private final int CONNECTING = 0; - - private int Connect = NOT_CONNECTED; - - public MainScreen() - { - display = Display.getDisplay(this); - keyHandler = new KeyCanvas(this); - keyHandler.addCommand(CMD_LOG); - keyHandler.addCommand(CMD_DISCONNECT); - keyHandler.setCommandListener(this); - } - - - public void Disconnect() - { - RecvThread.close(); - BluetoothCommunicator.Disconnect(); - MainForm.removeCommand(CMD_DISCONNECT); - MainForm.removeCommand(CMD_SHOWREMOTE); - MainForm.addCommand(CMD_CONNECT); - Connect = NOT_CONNECTED; - } - - public void Connect() - { - if (Connect == CONNECTED) - return; - Connect = CONNECTING; - MainForm = CreateForm("Connect log"); - display.setCurrent(MainForm); - try - { - String Connectable = BluetoothServiceDiscovery.Scan(MainForm, "ACDC"); - if (Connectable != null) - { - MainForm.append("\n" + Connectable); - display.setCurrent(MainForm); - if (BluetoothCommunicator.Connect(MainForm, Connectable)) - Connect = CONNECTED; - else - Connect = NOT_CONNECTED; - - display.setCurrent(MainForm); - BluetoothCommunicator.Handshake(MainForm, display); - RecvThread = new BluetoothCommunicator(this, MainForm); - - display.setCurrent(MainForm); - } - } - catch (Exception e) - { - MainForm.append("Error: Couldn't Search"); - Connect = NOT_CONNECTED; - display.setCurrent(MainForm); - return; - } - - if (Connect == CONNECTED) - { - MainForm.addCommand(CMD_SHOWREMOTE); - MainForm.addCommand(CMD_DISCONNECT); - MainForm.append("Connected to a server now we start the receive thread\n"); - RecvThread.start(); - } - else - { - MainForm.addCommand(CMD_CONNECT); - MainForm.addCommand(CMD_EXIT); - MainForm.append("Not connected to a server"); - } - setCurrent(); - } - - public void startApp() - { - int length = ((255 << 8) | (255)); - System.out.println("Len " + length); - - - MainForm = CreateForm("XBMC Remote"); - MainForm.append("Hi and welcome to the version " + Version + " of XBMC Remote.\nPressing Connect will have this remote connect to the first available Server"); - setCurrent(); - } - - private Form CreateForm(String Title) - { - Form rtnForm = new Form(Title); - if (Connect == CONNECTED) - rtnForm.addCommand(CMD_OK); - else if (Connect == NOT_CONNECTED) - rtnForm.addCommand(CMD_CONNECT); - - if (Connect == CONNECTED) - rtnForm.addCommand(CMD_DISCONNECT); - else if (Connect == NOT_CONNECTED) - rtnForm.addCommand(CMD_EXIT); - - rtnForm.setCommandListener(this); - return rtnForm; - } - - private void setCurrent() - { - setCurrent(false); - } - private void setCurrent(boolean forceLog) - { - if (forceLog) - display.setCurrent(MainForm); - else if (Connect == CONNECTED) - { - display.setCurrent(keyHandler); - keyHandler.repaint(); - } - else - { - display.setCurrent(MainForm); - } - } - - public void pauseApp() - { - } - - public void destroyApp(boolean unconditional) - { - if (Connect == CONNECTED) - { - BluetoothCommunicator.Disconnect(); - RecvThread.close(); - } - } - - public void commandAction(Command c, Displayable d) - { - if (c.equals(CMD_LOG)) - setCurrent(true); - else if (c.equals(CMD_SHOWREMOTE)) - { - display.setCurrent(keyHandler); - keyHandler.repaint(); - } - else if (d.equals(MainForm)) - { - if (c.equals(CMD_OK)) - { - byte[] Packet = {'1', '1'}; // 48 == '0' - BluetoothCommunicator.Send(Packet); - } - else if (c.equals(CMD_CONNECT)) - { - this.Connect(); - } - else if (c.equals(CMD_EXIT)) - System.out.println("QUIT"); - else if (c.equals(CMD_DISCONNECT)) - { - this.Disconnect(); - this.RecvThread.close(); - setCurrent(); - } - } - else if (d.equals(keyHandler)) - { - if (c.equals(CMD_OK)) - { - byte[] Packet = {'2', (byte)251 }; - BluetoothCommunicator.Send(Packet); - } - else if (c.equals(CMD_DISCONNECT)) - { - this.Disconnect(); - Connect = NOT_CONNECTED; - setCurrent(); - } - } - } - - public void keyPressed(int keyCode) - { - byte[] Packet = {'2', (byte)keyCode}; - if (keyCode >= Canvas.KEY_NUM0 && keyCode <= Canvas.KEY_NUM9) - Packet[1] = (byte)keyCode; - - else if (keyCode == Canvas.UP || keyCode == -1) - Packet[1] = 'U'; - else if (keyCode == Canvas.DOWN || keyCode == -2) - Packet[1] = 'D'; - else if (keyCode == Canvas.LEFT || keyCode == -3) - Packet[1] = 'L'; - else if (keyCode == Canvas.RIGHT || keyCode == -4) - Packet[1] = 'R'; - - else if (keyCode == Canvas.KEY_STAR) - Packet[1] = '*'; - else if (keyCode == Canvas.KEY_POUND) - Packet[1] = '#'; - - BluetoothCommunicator.Send(Packet); - System.out.println("got" + keyCode + " I'll send [" + Packet[0] + "," + Packet[1] + "]"); - } - public void Recv(int Header, byte[] Payload) - { - switch(Header) - { - case BluetoothEvent.RECV_COMMAND: - break; - case BluetoothEvent.RECV_SYSTEM: - if (Payload[0] == 0) - this.Disconnect(); - break; - case BluetoothEvent.RECV_IMAGE: - keyHandler.SetCover(Image.createImage(Payload, 0, Payload.length)); - break; - } - } -} diff --git a/tools/EventClients/Clients/J2ME Client/src/XBMCRemote.jad b/tools/EventClients/Clients/J2ME Client/src/XBMCRemote.jad deleted file mode 100644 index e40999eef6..0000000000 --- a/tools/EventClients/Clients/J2ME Client/src/XBMCRemote.jad +++ /dev/null @@ -1,9 +0,0 @@ -MIDlet-1: MainScreen, , MainScreen -MIDlet-Icon: icon.png -MIDlet-Jar-Size: 12153 -MIDlet-Jar-URL: XBMC Remote.jar -MIDlet-Name: XBMC Remote -MIDlet-Vendor: team-xbmc -MIDlet-Version: 0.1 -MicroEdition-Configuration: CLDC-1.0 -MicroEdition-Profile: MIDP-1.0 diff --git a/tools/EventClients/Makefile.in b/tools/EventClients/Makefile.in index 757ee0b141..2cd5712bfa 100644 --- a/tools/EventClients/Makefile.in +++ b/tools/EventClients/Makefile.in @@ -10,14 +10,9 @@ Clients/WiiRemote/WiiRemote: cd Clients/WiiRemote && \ $(CXX) $(CXXFLAGS) $(LDFLAGS) CWIID_WiiRemote.cpp -lcwiid -lbluetooth -DICON_PATH="\"$(datarootdir)/pixmaps/@APP_NAME_LC@/\"" $(WII_EXTRA_OPTS) -o WiiRemote -j2me-remote: - cd Clients/J2ME\ Client - ant -f build.xml - install: Clients/WiiRemote/WiiRemote mkdir -p $(DESTDIR)$(bindir) cp -a Clients/WiiRemote/WiiRemote $(DESTDIR)$(bindir)/@APP_NAME_LC@-wiiremote - cp -a Clients/J2ME\ Client/j2me_remote.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-j2meremote cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-ps3remote cp -a Clients/PS3\ Sixaxis\ Controller/ps3d.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-ps3d cp -a Clients/Kodi\ Send/kodi-send.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-send diff --git a/tools/EventClients/README.txt b/tools/EventClients/README.txt index 6e1a454e5b..591964fb98 100644 --- a/tools/EventClients/README.txt +++ b/tools/EventClients/README.txt @@ -88,14 +88,3 @@ The WiiRemote is mappable with keymap.xml where button id's are the following: 10 = 1 11 = 2 The name is by standard WiiRemote but this can be changed with the --joystick-name - -J2ME (Java Phone Application) ------------------------------ - -To use the J2ME client only CLDC 1.0 and MIDP 1.0 is needed. -The client will also need bluetooth and must be able to initialize the connection. -For compilation of the Java Application see Clients/J2ME Client/README but precompiled versions -exists in our forum. - -The Client is mappable in the same manner as PS3 in keymap.xml but with the name J2ME (<joystick name="J2ME">). -The KeyID's generated in terminal when running j2me_remote.py. diff --git a/tools/depends/native/python27-native/Makefile b/tools/depends/native/python27-native/Makefile index cfa705e42a..ed3e76a217 100644 --- a/tools/depends/native/python27-native/Makefile +++ b/tools/depends/native/python27-native/Makefile @@ -4,7 +4,7 @@ DEPS= ../../Makefile.include.in Makefile # lib name, version LIBNAME=Python -VERSION=2.7.11 +VERSION=2.7.12 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.xz CWD=$(shell pwd) diff --git a/tools/depends/target/config-binaddons.site.in b/tools/depends/target/config-binaddons.site.in index 0753a4c1a6..a8afdd7c09 100644 --- a/tools/depends/target/config-binaddons.site.in +++ b/tools/depends/target/config-binaddons.site.in @@ -34,9 +34,6 @@ LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH NATIVE_ROOT=@prefix@/@tool_dir@ -#libomxil-bellagio -ac_cv_func_malloc_0_nonnull=yes - #curl ac_cv_file__dev_urandom=yes ac_cv_lib_ssl_SSL_connect=yes diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION index c38483e7a2..2c0032a30b 100644 --- a/tools/depends/target/ffmpeg/FFMPEG-VERSION +++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION @@ -1,5 +1,5 @@ LIBNAME=ffmpeg BASE_URL=https://github.com/xbmc/FFmpeg/archive -VERSION=release/3.0-xbmc +VERSION=3.1.1-Krypton-Alpha3 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz GNUTLS_VER=3.4.9 diff --git a/tools/depends/target/libbluray/Makefile b/tools/depends/target/libbluray/Makefile index 3c85b96ca3..09d2a8e04e 100644 --- a/tools/depends/target/libbluray/Makefile +++ b/tools/depends/target/libbluray/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libbluray -VERSION=0.8.1 +VERSION=0.9.3 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.bz2 @@ -24,9 +24,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) # libbluray has borked Makefile.am with respect to CFLAGS, remove the offending line sed -i -e "s|CFLAGS=|#CFLAGS=|" $(PLATFORM)/Makefile.am -ifeq ($(OS),android) - cd $(PLATFORM); patch -p1 < ../android.patch -endif cd $(PLATFORM); ./bootstrap cd $(PLATFORM); $(CONFIGURE) diff --git a/tools/depends/target/libbluray/android.patch b/tools/depends/target/libbluray/android.patch deleted file mode 100644 index 3537330379..0000000000 --- a/tools/depends/target/libbluray/android.patch +++ /dev/null @@ -1,23 +0,0 @@ - src/file/mount.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/file/mount.c b/src/file/mount.c -index 6382d8b..4f5392a 100644 ---- a/src/file/mount.c -+++ b/src/file/mount.c -@@ -44,6 +44,7 @@ char *mount_get_mountpoint(const char *device_path) - return str_dup(device_path); - } - -+#ifndef ANDROID - FILE *f = setmntent ("/proc/self/mounts", "r"); - if (f) { - struct mntent* m; -@@ -61,6 +62,7 @@ char *mount_get_mountpoint(const char *device_path) - } - endmntent (f); - } -+#endif - #endif /* HAVE_MNTENT_H */ - - return str_dup(device_path); diff --git a/tools/depends/target/libomxil-bellagio/Makefile b/tools/depends/target/libomxil-bellagio/Makefile deleted file mode 100644 index 7c64058383..0000000000 --- a/tools/depends/target/libomxil-bellagio/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -include ../../Makefile.include -DEPS= ../../Makefile.include android-fix-build.patch Makefile oscl/* - -# lib name, version -LIBNAME=libomxil-bellagio -VERSION=0.9.3 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -# configuration settings -CFLAGS+=-I$(CURDIR)/oscl -CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ - ./configure --prefix=$(PREFIX) --disable-shared \ - --enable-android - -LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a - -CLEAN_FILES=$(ARCHIVE) $(PLATFORM) - -all: .installed-$(PLATFORM) - -$(TARBALLS_LOCATION)/$(ARCHIVE): - cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) "$(BASE_URL)/$(ARCHIVE)" - -$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 < ../android-fix-build.patch - cd $(PLATFORM); autoreconf -vif - cd $(PLATFORM); $(CONFIGURE) - -$(LIBDYLIB): $(PLATFORM) - $(MAKE) -j 1 -C $(PLATFORM) - -.installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM) install - touch $@ - -clean: - $(MAKE) -C $(PLATFORM) clean - rm -f .installed-$(PLATFORM) - -distclean:: - rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/tools/depends/target/libomxil-bellagio/android-fix-build.patch b/tools/depends/target/libomxil-bellagio/android-fix-build.patch deleted file mode 100644 index a6e61db326..0000000000 --- a/tools/depends/target/libomxil-bellagio/android-fix-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN armeabi-v7a/configure.ac armeabi-v7a-good/configure.ac ---- armeabi-v7a/configure.ac 2011-05-20 01:44:18.000000000 -0400 -+++ armeabi-v7a-good/configure.ac 2012-06-19 01:58:45.483524179 -0400 -@@ -5,7 +5,7 @@ - AC_PREREQ([2.59]) - - AC_CONFIG_HEADERS([config.h]) --CFLAGS="${CFLAGS} -Wall -Werror" -+CFLAGS="${CFLAGS} -Wall" - - ################################################################################ - # Set the shared versioning info, according to section 6.3 of the libtool info # -@@ -149,8 +149,6 @@ - # Check for libraries # - ################################################################################ - --AC_CHECK_LIB([pthread], [pthread_create]) -- - # Check for libdl - AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([libdl is required])]) - -diff -ruN armeabi-v7a/src/Makefile.am armeabi-v7a-good/src/Makefile.am ---- armeabi-v7a/src/Makefile.am 2011-05-20 01:28:17.000000000 -0400 -+++ armeabi-v7a-good/src/Makefile.am 2012-06-19 01:59:23.603524155 -0400 -@@ -27,7 +27,7 @@ - - libomxil_bellagio_la_CFLAGS = -I$(top_srcdir)/include -I$(srcdir)/base -I$(srcdir)/core_extensions \ - -DINSTALL_PATH_STR=\"$(plugindir)\" -DOMX_LOADERS_DIRNAME=\"$(libdir)/omxloaders\/\" --libomxil_bellagio_la_LIBADD = base/libomxbase.la core_extensions/libomxcoreext.la -lpthread -+libomxil_bellagio_la_LIBADD = base/libomxbase.la core_extensions/libomxcoreext.la - libomxil_bellagio_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ - - include_extradir = $(includedir)/bellagio diff --git a/tools/depends/target/libomxil-bellagio/oscl/oscl_base_macros.h b/tools/depends/target/libomxil-bellagio/oscl/oscl_base_macros.h deleted file mode 100644 index 30fc86863d..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/oscl_base_macros.h +++ /dev/null @@ -1,159 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L B A S E _ M A C R O S - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -/*! \addtogroup osclbase OSCL Base - * - * @{ - */ - - -/*! \file oscl_base_macros.h - \brief This file defines common macros and constants for basic compilation support. -*/ - -#ifndef OSCL_BASE_MACROS_H_INCLUDED -#define OSCL_BASE_MACROS_H_INCLUDED - -// Pick up any platform-specific definitions for the common -// macros. -#include "osclconfig.h" - -// Define default values for the common macros -#ifndef OSCL_EXPORT_REF -#define OSCL_EXPORT_REF -#endif - -#ifndef OSCL_IMPORT_REF -#define OSCL_IMPORT_REF -#endif - -//! The NULL_TERM_CHAR is used to terminate c-style strings. -//static const char NULL_TERM_CHAR = '\0'; -#ifndef NULL_TERM_CHAR -#define NULL_TERM_CHAR '\0' -#endif - -//! if the NULL macro isn't already defined, then define it as zero. -#ifndef NULL -#define NULL (0) -#endif - -#if (OSCL_DISABLE_INLINES) -#define OSCL_INLINE -#define OSCL_COND_EXPORT_REF OSCL_EXPORT_REF -#define OSCL_COND_IMPORT_REF OSCL_IMPORT_REF -#else -#define OSCL_INLINE inline -#define OSCL_COND_EXPORT_REF -#define OSCL_COND_IMPORT_REF -#endif - -//this macro may not be defined in all configurations -//so a default is defined here. - -//! Type casting macros -/*! - \param type Destination type of cast - \param exp Expression to cast -*/ - -#define OSCL_CONST_CAST(type,exp) ((type)(exp)) -#define OSCL_STATIC_CAST(type,exp) ((type)(exp)) -#define OSCL_REINTERPRET_CAST(type,exp) ((type)(exp)) -#define OSCL_DYNAMIC_CAST(type, exp) ((type)(exp)) -#define OSCL_VIRTUAL_BASE(type) type - - -/** - * The following two macros are used to avoid compiler warnings. - * - * OSCL_UNUSED_ARG(vbl) is used to "reference" an otherwise unused - * parameter or variable, often one which is used only in an - * OSCL_ASSERT and thus unreferenced in release mode - * OSCL_UNUSED_RETURN(val) provides a "return" of a value, in places - * which will not actually be executed, such as after an - * OSCL_LEAVE or Thread::exit or abort. The value needs to - * be of an appropriate type for the current function, though - * zero will usually suffice. Note that OSCL_UNUSED_RETURN - * will not be necessary for 'void' functions, as there is no - * requirement for a value-return operation. - */ -#define OSCL_UNUSED_ARG(vbl) (void)(vbl) -#define OSCL_UNUSED_RETURN(value) return value - -/* The __TFS__ macro is used to optionally expand to "<>" depending on the - * compiler. Some compilers require it to indicate that the friend function - * is a template function as specified in the standard, but others don't - * like it so it will handled with a macro expansion that depends on the - * compiler. - */ -#ifndef __TFS__ -#define __TFS__ -#endif - -#define OSCL_MIN(a,b) ((a) < (b) ? (a) : (b)) -#define OSCL_MAX(a,b) ((a) > (b) ? (a) : (b)) -#define OSCL_ABS(a) ((a) > (0) ? (a) : -(a)) - -// the syntax for explicitly calling the destructor varies on some platforms -// below is the default syntax as defined in the C++ standard -#ifndef OSCL_TEMPLATED_DESTRUCTOR_CALL -#define OSCL_TEMPLATED_DESTRUCTOR_CALL(type,simple_type) type :: ~simple_type () -#endif - - -/* - * The OSCL_UNSIGNED_CONST macro is used to optionally add a suffix to the - * end of integer constants to identify them as unsigned constants. It is - * usually only necessary to do that for very large constants that are too - * big to fit within the range of a signed integer. Some compilers will issue - * warnings for that. The default behavior will be to add no suffix. - */ - -#ifndef OSCL_UNSIGNED_CONST -#define OSCL_UNSIGNED_CONST(x) x -#endif - -/* - * These macros are used by MTP to avoid byte aligning structures. - */ -#ifndef OSCL_PACKED_VAR -#define OSCL_PACKED_VAR "error" -#endif - - -/* The following macros enumerate the possible values of the build flag PV_COMPILER */ - -#define EPV_ARM_GNUC 1 /* for GNU compiler */ -#define EPV_ARM_RVCT 2 /* for RVCT compiler from ARM */ -#define EPV_ARM_MSEVC 3 /* for MS Embedded VC compiler */ - -/* PV_COMPILER value must be set to build command. - In addition, PV_CPU_ARCH_VERSION must be defined to take on an integer value that specifies the version of target - ARM architecture. */ - - -/*! @} */ - -#endif // OSCL_BASE_MACROS_H_INCLUDED diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig.h deleted file mode 100644 index e664e19008..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig.h +++ /dev/null @@ -1,105 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G ( P L A T F O R M C O N F I G I N F O ) - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig.h - * \brief This file contains configuration information for the linux platform - * - */ - -#ifndef OSCLCONFIG_H_INCLUDED -#define OSCLCONFIG_H_INCLUDED - -// system includes for dynamic registry -#include <dirent.h> -#include <dlfcn.h> - -#define OSCL_HAS_ANDROID_SUPPORT 1 -#define OSCL_HAS_ANDROID_FILE_IO_SUPPORT 1 - -#define OSCL_EXPORT_REF __attribute__ ((visibility("default"))) -#define OSCL_IMPORT_REF __attribute__ ((visibility("default"))) - -// include common include for determining sizes from limits.h -#include "osclconfig_limits_typedefs.h" - -//This switch turns off some profiling and debug settings -#ifndef OSCL_RELEASE_BUILD -#ifdef NDEBUG -#define OSCL_RELEASE_BUILD 1 -#else -#define OSCL_RELEASE_BUILD 0 -#endif -#endif - -#ifndef PVLOGGER_INST_LEVEL -#if (OSCL_RELEASE_BUILD) -//Release mode logging - should be kept minimum -#define PVLOGGER_INST_LEVEL 2 -#else -//full logging -#define PVLOGGER_INST_LEVEL 5 -#endif -#endif - -// include common unix definitions -#include "osclconfig_unix_android.h" - -// define the suffix for unsigned constants -#define OSCL_UNSIGNED_CONST(x) x##u - -// override the common definition for -#undef OSCL_NATIVE_UINT64_TYPE -#define OSCL_NATIVE_UINT64_TYPE u_int64_t - -// include the definitions for the processor -#include "osclconfig_ix86.h" - -// the syntax for explicitly calling the destructor varies on some platforms -// below is the default syntax as defined by another ARM project -#define OSCL_TEMPLATED_DESTRUCTOR_CALL(type,simple_type) ~type () - - -/* The __TFS__ macro is used to optionally expand to "<>" depending on the - * compiler. Some compilers require it to indicate that the friend function - * is a template function as specified in the standard, but others don't - * like it so it will handled with a macro expansion that depends on the - * compiler. - */ -#define __TFS__ <> - -#define OSCL_HAS_PRAGMA_PACK 0 -#define OSCL_HAS_PACKED_STRUCT 1 -#define OSCL_PACKED_VAR(x) x __attribute__((packed)) -#define OSCL_PACKED_STRUCT_BEGIN -#define OSCL_PACKED_STRUCT_END __attribute__((packed)) - -//set this to 1 to enable OSCL_ASSERT in release builds. -#define OSCL_ASSERT_ALWAYS 0 - - -// check all osclconfig required macros are defined -#include "osclconfig_check.h" - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_ansi_memory.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_ansi_memory.h deleted file mode 100644 index fb53ea1326..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_ansi_memory.h +++ /dev/null @@ -1,42 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ A N S I _ M E M O R Y - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_ansi_memory.h - * \brief This file contains common typedefs based on the ANSI C limits.h header - * - * This header file should work for any ANSI C compiler to determine the - * proper native C types to use for OSCL integer types. - */ - - -#ifndef OSCLCONFIG_ANSI_MEMORY_H_INCLUDED -#define OSCLCONFIG_ANSI_MEMORY_H_INCLUDED - -#include <memory.h> -typedef size_t oscl_memsize_t; -#define OSCL_HAS_ANSI_MEMORY_FUNCS 1 - - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_check.h deleted file mode 100644 index 19d0b63e61..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_check.h +++ /dev/null @@ -1,423 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -#ifndef OSCLCONFIG_CHECK_H_INCLUDED -#define OSCLCONFIG_CHECK_H_INCLUDED - -/*! \addtogroup osclconfig OSCL config - * - * @{ - */ - -/** -\def Make sure the basic types are defined, -either in osclconfig_limits_typedefs.h or elsewhere. -*/ -typedef int8 __int8__check__; -typedef uint8 __uint8__check__; -typedef int16 __int16__check__; -typedef uint16 __uint16__check__; -typedef int32 __int32__check__; -typedef uint32 __uint32__check__; - -/** -\def OSCL_ASSERT_ALWAYS macro should be set to 0 or 1. -When set to 1, OSCL_ASSERT will be compiled in release mode as well -as debug mode. -*/ -#ifndef OSCL_ASSERT_ALWAYS -#error "ERROR: OSCL_ASSERT_ALWAYS has to be defined to either 1 or 0." -#endif - - -/** -\def OSCL_DISABLE_INLINES macro should be set to 1 if -the target compiler supports 'inline' function definitions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_DISABLE_INLINES -#error "ERROR: OSCL_DISABLE_INLINES has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_HAS_ANSI_STDLIB_SUPPORT macro should be set to 1 if -the target compiler supports ANSI C standard lib functions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_STDLIB_SUPPORT -#error "ERROR: OSCL_HAS_ANSI_STDLIB_SUPPORT has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_HAS_ANSI_STDIO_SUPPORT macro should be set to 1 if -the target compiler supports ANSI C standard I/O functions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_STDIO_SUPPORT -#error "ERROR: OSCL_HAS_ANSI_STDIO_SUPPORT has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_HAS_ANSI_STRING_SUPPORT macro should be set to 1 if -the target compiler supports ANSI C standard string functions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_STRING_SUPPORT -#error "ERROR: OSCL_HAS_ANSI_STRING_SUPPORT has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_HAS_UNICODE_SUPPORT macro should be set to 1 if -the target platform has a native 16-bit (wide) character type. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_UNICODE_SUPPORT -#error "ERROR: OSCL_HAS_UNICODE_SUPPORT has to be defined to either 1 or 0." -#endif - -/** -\def _STRLIT macro should be set to an expression to convert -a constant character string into a string literal type -appropriate for the platform. -Otherwise it should be set to 0. -*/ -#ifndef _STRLIT -#error "ERROR: _STRLIT has to be defined." -#endif - -/** -\def _STRLIT_CHAR macro should be set to an expression to convert -a constant character string into a char string literal type -appropriate for the platform. -Otherwise it should be set to 0. -*/ -#ifndef _STRLIT_CHAR -#error "ERROR: _STRLIT_CHAR has to be defined." -#endif - -/** -When OSCL_HAS_UNICODE_SUPPORT==1, -\def _STRLIT_WCHAR macro should be set to an expression to convert -a constant character string into a wchar string literal type -appropriate for the platform. -Otherwise it should be set to 0. -*/ -#if (OSCL_HAS_UNICODE_SUPPORT) && !defined(_STRLIT_WCHAR) -#error "ERROR: _STRLIT_WCHAR has to be defined" -#endif - -/** -When OSCL_HAS_UNICODE_SUPPORT==1, -\def OSCL_NATIVE_WCHAR_TYPE macro should be set to -the native wide character type for the platform. -Otherwise it should be set to 0. -*/ -#if (OSCL_HAS_UNICODE_SUPPORT) && !defined(OSCL_NATIVE_WCHAR_TYPE) -#error "ERROR: OSCL_NATIVE_WCHAR_TYPE has to be defined." -#endif - -/** -\def OSCL_HAS_MSWIN_SUPPORT macro should be set to 1 if -the target platform supports the Win32 API. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_MSWIN_SUPPORT -#error "ERROR: OSCL_HAS_MSWIN_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -\def OSCL_HAS_MSWIN_PARTIAL_SUPPORT macro should be set to 1 if -the target platform supports the WinMobile API. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_MSWIN_PARTIAL_SUPPORT -#error "ERROR: OSCL_HAS_MSWIN_PARTIAL_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -\def OSCL_HAS_UNIX_SUPPORT macro should be set to 1 if -the target platform supports the Unix API. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_UNIX_SUPPORT -#error "ERROR: OSCL_HAS_UNIX_SUPPORT has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_HAS_SYMBIAN_SUPPORT macro should be set to 1 if -the target platform supports the Symbian API. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_SUPPORT -#error "ERROR: OSCL_HAS_SYMBIAN_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -\def OSCL_HAS_ANDROID_SUPPORT macro should be set to 1 if -the target platform supports the Android API. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANDROID_SUPPORT -#error "ERROR: OSCL_HAS_ANDROID_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -\def OSCL_HAS_IPHONE_SUPPORT macro should be set to 1 if -the target platform supports the iPhone API. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_IPHONE_SUPPORT -#error "ERROR: OSCL_HAS_IPHONE_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -\def OSCL_INTEGERS_WORD_ALIGNED macro should be set to 1 if -the target platform requires integers to be word-aligned in memory. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_INTEGERS_WORD_ALIGNED -#error "ERROR: OSCL_INTEGERS_WORD_ALIGNED has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_BYTE_ORDER_BIG_ENDIAN macro should be set to 1 if -the target platform uses big-endian byte order in memory. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_BYTE_ORDER_BIG_ENDIAN -#error "ERROR: OSCL_BYTE_ORDER_BIG_ENDIAN has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_BYTE_ORDER_LITTLE_ENDIAN macro should be set to 1 if -the target platform uses little-endian byte order in memory. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_BYTE_ORDER_LITTLE_ENDIAN -#error "ERROR: OSCL_BYTE_ORDER_LITTLE_ENDIAN has to be defined to either 1 or 0." -#endif - -/** -\def Either OSCL_BYTE_ORDER_BIG_ENDIAN must be set to 1 -or else OSCL_BYTE_ORDER_LITTLE_ENDIAN must be set to 1. -*/ -#if !(OSCL_BYTE_ORDER_BIG_ENDIAN) && !(OSCL_BYTE_ORDER_LITTLE_ENDIAN) -#error "ERROR: either OSCL_BYTE_ORDER_LITTLE_ENDIAN or else OSCL_BYTE_ORDER_BIG_ENDIAN must be 1." -#endif -#if (OSCL_BYTE_ORDER_BIG_ENDIAN) && (OSCL_BYTE_ORDER_LITTLE_ENDIAN) -#error "ERROR: either OSCL_BYTE_ORDER_LITTLE_ENDIAN or else OSCL_BYTE_ORDER_BIG_ENDIAN must be 1." -#endif - -/** -\def OSCL_HAS_GLOBAL_VARIABLE_SUPPORT macro should be set to 1 if -the target platform allows global variable definitions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_GLOBAL_VARIABLE_SUPPORT -#error "ERROR: OSCL_HAS_GLOBAL_VARIABLE_SUPPORT has to be defined to either 1 or 0." -#endif - -/** -Note: only one byte order mode can be defined per platform. -*/ -#if (OSCL_BYTE_ORDER_LITTLE_ENDIAN) && (OSCL_BYTE_ORDER_BIG_ENDIAN) -#error "ERROR: Multiple selection for OSCL_BYTE_ORDER." -#endif - -/** -\def OSCL_HAS_ANSI_STRING_SUPPORT macro should be set to 1 if -the target platform supports C standard string functions (string.h). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_STRING_SUPPORT -#error "ERROR: OSCL_HAS_ANSI_STRING_SUPPORT has to be defined to either 1 or 0." -#endif - -/** -\def OSCL_NATIVE_INT64_TYPE has to be defined to the native -signed 64-bit integer type. -*/ -#ifndef OSCL_NATIVE_INT64_TYPE -#error "ERROR: OSCL_NATIVE_INT64_TYPE has to be defined." -#endif - -/** -\def OSCL_NATIVE_UINT64_TYPE has to be defined to the native -unsigned 64-bit integer type. -*/ -#ifndef OSCL_NATIVE_UINT64_TYPE -#error "ERROR: OSCL_NATIVE_UINT64_TYPE has to be defined." -#endif - -/** -\def INT64(x) has to be defined to the expression for a signed -64-bit literal. -*/ -#ifndef INT64 -#error "ERROR: INT64(x) has to be defined." -#endif - -/** -\def UINT64(x) has to be defined to the expression for an unsigned -64-bit literal. -*/ -#ifndef UINT64 -#error "ERROR: UINT64(x) has to be defined." -#endif - -/** -\def INT64_HILO(high,low) has to be defined to an expression -to create a signed 64-bit integer from 2 32-bit integers. -*/ -#ifndef INT64_HILO -#error "ERROR: INT64_HILO(high,low) has to be defined." -#endif - -/** -\def UINT64_HILO(high,low) has to be defined to an expression -to create an unsigned 64-bit integer from 2 32-bit integers. -*/ -#ifndef UINT64_HILO -#error "ERROR: UINT64_HILO(high,low) has to be defined." -#endif - -/** -\def OSCL_MEMFRAG_PTR_BEFORE_LEN macro should be set to 1 if -memory fragements data structures, such as used by sendmsg -(i.e., the iovec data structures), should use ptr before length. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_MEMFRAG_PTR_BEFORE_LEN -#error "ERROR: OSCL_MEMFRAG_PTR_BEFORE_LEN has to be defined to either 0 or 1" -#endif - -/** -\def OSCL_HAS_TLS_SUPPORT macro should be set to 1 if -the target platform has thread-local storage functions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_TLS_SUPPORT -#error "ERROR: OSCL_HAS_TLS_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -\def OSCL_TLS_IS_KEYED macro should be set to 1 if -the target platform's thread local storage function requires an -input key value to uniquely identify the TLS. -If the thread local storage function does not require any key, -or thread local storage is not supported, it should be set to 0. -*/ -#ifndef OSCL_TLS_IS_KEYED -#error "ERROR: OSCL_TLS_IS_KEYED has to be defined to either 1 or 0" -#endif - - -/** -When OSCL_TLS_IS_KEYED==1, -\def OSCL_TLS_STORE_FUNC macro must be set to an expression that will -set the TLS value and evalutes to true on success, false on failure. -The macro takes 2 input parameters (key, ptr). -*/ -#if (OSCL_TLS_IS_KEYED) && !defined(OSCL_TLS_STORE_FUNC) -#error "ERROR: OSCL_TLS_STORE_FUNC has to be defined" -#endif - -/** -When OSCL_TLS_IS_KEYED==1, -\def OSCL_TLS_GET_FUNC macro should be set to an expression that -returns the TLS value. -The macro takes 1 input parameter (key). -*/ -#if (OSCL_TLS_IS_KEYED) && !defined(OSCL_TLS_GET_FUNC) -#error "ERROR: OSCL_TLS_GET_FUNC has to be defined" -#endif - -/** -When OSCL_TLS_IS_KEYED==1, -\def OSCL_TLS_GET_FUNC macro should be set to an expression that -creates a TLS entry and evalutes to true on success, false on failure. -The macro takes 1 input parameter (key). -*/ -#if (OSCL_TLS_IS_KEYED) && !defined(OSCL_TLS_KEY_CREATE_FUNC) -#error "ERROR: OSCL_TLS_KEY_CREATE_FUNC has to be defined" -#endif - -/** -When OSCL_TLS_IS_KEYED==1, -\def OSCL_TLS_GET_FUNC macro should be set to an expression that -deletes a TLS entry. -The macro takes 1 input parameter (key). -*/ -#if (OSCL_TLS_IS_KEYED) && !defined(OSCL_TLS_KEY_DELETE_FUNC) -#error "ERROR: OSCL_TLS_KEY_DELETE_FUNC has to be defined" -#endif - - -/** -When OSCL_TLS_IS_KEYED==0, -\def OSCL_TLS_STORE_FUNC macro must be set to an expression that will -set the TLS value and evalutes to true on success, false on failure. -The macro takes 1 input parameter (ptr). -*/ -#if (OSCL_HAS_TLS_SUPPORT) && !(OSCL_TLS_IS_KEYED) && !defined(OSCL_TLS_STORE_FUNC) -#error "ERROR: OSCL_TLS_STORE_FUNC has to be defined" -#endif - -/** -When OSCL_TLS_IS_KEYED==0, -\def OSCL_TLS_GET_FUNC macro should be set to an expression that -returns the TLS value. -*/ -#if (OSCL_HAS_TLS_SUPPORT) && !(OSCL_TLS_IS_KEYED) && !defined(OSCL_TLS_GET_FUNC) -#error "ERROR: OSCL_TLS_GET_FUNC has to be defined" -#endif - -/** -OSCL_HAS_BASIC_LOCK should be set to 1 if the platform has basic lock support. -*/ -#if !defined(OSCL_HAS_BASIC_LOCK ) -#error "ERROR: OSCL_HAS_BASIC_LOCK must be defined to 0 or 1" -#endif - - -/** -When OSCL_HAS_BASIC_LOCK is 1, -type TOsclBasicLockObject should be defined as the type used as -a mutex object or handle on the target platform. It can -be either typedef'd as a C-compilable type or can be #defined. -Examples: -typedef pthread_mutex_t TOsclBasicLockObject; -#define TOsclBasicLockObject RMutex -*/ -#if (OSCL_HAS_BASIC_LOCK) && !defined(TOsclBasicLockObject) -typedef TOsclBasicLockObject __verify__TOsclBasicLockObject__defined__; -#endif - -/** -\def OSCL_HAS_PRAGMA_PACK macro should be set to 1 if the compiler supports -pragma pack, 0 if it does not. -*/ -#ifndef OSCL_HAS_PRAGMA_PACK -#error "ERROR: OSCL_HAS_PRAGMA_PACK must be defined to 0 or 1" -#endif - -/*! @} */ - -#endif // OSCLCONFIG_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_compiler_warnings.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_compiler_warnings.h deleted file mode 100644 index 28d741813f..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_compiler_warnings.h +++ /dev/null @@ -1,44 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ C O M P I L E R _ W A R N I N G S - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_compiler_warnings.h - * \brief This file contains the ability to turn off/on compiler warnings - * - */ - -// This macro enables the "#pragma GCC system_header" found in any header file that -// includes this config file. -// "#pragma GCC system_header" suppresses compiler warnings in the rest of that header -// file by treating the header as a system header file. -// For instance, foo.h has 30 lines, "#pragma GCC system_header" is inserted at line 10, -// from line 11 to the end of file, all compiler warnings are disabled. -// However, this does not affect any files that include foo.h. -// -#ifdef __GNUC__ -#define OSCL_DISABLE_GCC_WARNING_SYSTEM_HEADER -#endif - -#define OSCL_FUNCTION_PTR(x) (&x) - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_error.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_error.h deleted file mode 100644 index 6cdf86c270..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_error.h +++ /dev/null @@ -1,53 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ E R R O R - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_error.h - * \brief This file contains the common typedefs and header files needed to compile osclerror - * - */ - - -#ifndef OSCLCONFIG_ERROR_H_INCLUDED -#define OSCLCONFIG_ERROR_H_INCLUDED - -#ifndef OSCLCONFIG_H_INCLUDED -#include "osclconfig.h" -#endif - -#define OSCL_HAS_EXCEPTIONS 1 -#define OSCL_HAS_ERRNO_H 1 -#define OSCL_HAS_SYMBIAN_ERRORTRAP 0 -#define OSCL_HAS_SETJMP_H 1 - -// system header files -#include <setjmp.h> -#include <errno.h> - - -// confirm that all definitions have been defined -#include "osclconfig_error_check.h" - -#endif // OSCLCONFIG_ERROR_H_INCLUDED - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_error_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_error_check.h deleted file mode 100644 index 301181e89c..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_error_check.h +++ /dev/null @@ -1,63 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -#ifndef OSCLCONFIG_ERROR_CHECK_H_INCLUDED -#define OSCLCONFIG_ERROR_CHECK_H_INCLUDED - - -/** -OSCL_HAS_EXCEPTIONS macro should be set to 1 if -the target platform supports C++ exceptions (throw, catch). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_EXCEPTIONS -#error "ERROR: OSCL_HAS_EXCEPTIONS has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_EXCEPTIONS macro should be set to 1 if -the target platform supports the POSIX-compliant errno.h header file. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ERRNO_H -#error "ERROR: OSCL_HAS_ERRNO_H has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SYMBIAN_ERRORTRAP macro should be set to 1 if -the target platform has Symbian leave, trap, and cleanup stack support. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_ERRORTRAP -#error "ERROR: OSCL_HAS_SYMBIAN_ERRORTRAP has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SETJMP_H macro should be set to 1 if -the target platform supports the setjmp.h header file including -the setjmp and longjmp functions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SETJMP_H -#error "ERROR: OSCL_HAS_SETJMP_H has to be defined to either 1 or 0" -#endif - - -#endif //OSCLCONFIG_ERROR_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_global_new_delete.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_global_new_delete.h deleted file mode 100644 index d3d0112007..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_global_new_delete.h +++ /dev/null @@ -1,30 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -#ifndef OSCLCONFIG_GLOBAL_NEW_DELETE_H_INCLUDED -#define OSCLCONFIG_GLOBAL_NEW_DELETE_H_INCLUDED - -//This file contains overloads for the global new/delete operators -//for use in configurations without a native new/delete operator, -//or where it is desirable to overload the existing global new/delete -//operators. The implementation of the operators is in oscl_mem.cpp. - -void* operator new(size_t); -void operator delete(void*); - - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_global_placement_new.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_global_placement_new.h deleted file mode 100644 index 4ab19e7aa3..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_global_placement_new.h +++ /dev/null @@ -1,31 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -#ifndef OSCLCONFIG_GLOBAL_PLACEMENT_NEW_H_INCLUDED -#define OSCLCONFIG_GLOBAL_PLACEMENT_NEW_H_INCLUDED - -//This file contains a definition of placement new operator -//for use in configurations without a native placement new -//operator definition. - -inline void* operator new(size_t, void* ptr) -{ - return ptr; -} - - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_io.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_io.h deleted file mode 100644 index bca1245588..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_io.h +++ /dev/null @@ -1,309 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ I O - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_io.h - * \brief This file contains common typedefs based on the ANSI C limits.h header - * - * This header file should work for any ANSI C compiler to determine the - * proper native C types to use for OSCL integer types. - */ - - -#ifndef OSCLCONFIG_IO_H_INCLUDED -#define OSCLCONFIG_IO_H_INCLUDED - -#ifndef OSCLCONFIG_H_INCLUDED -#include "osclconfig.h" -#endif - -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <fcntl.h> -#include <signal.h> -#include <netdb.h> -#include <sys/mman.h> -#include <sys/types.h> -#include <errno.h> -#include <sys/vfs.h> -#include <dirent.h> -//#include <glob.h> -#if (OSCL_HAS_ANSI_STDLIB_SUPPORT) -#if (OSCL_HAS_UNIX_SUPPORT) -#include <sys/stat.h> -#endif -#endif - -//For File I/O -#define OSCL_HAS_GLOB 0 -#define OSCL_HAS_ANSI_FILE_IO_SUPPORT 1 -#define OSCL_HAS_ANSI_64BIT_FILE_IO_SUPPORT 0 -#define OSCL_HAS_MSWIN_FILE_IO_SUPPORT 0 -#define OSCL_HAS_SYMBIAN_COMPATIBLE_IO_FUNCTION 0 -#define OSCL_HAS_NATIVE_FILE_CACHE_ENABLE 1 -#define OSCL_FILE_BUFFER_MAX_SIZE 32768 -#define OSCL_HAS_PV_FILE_CACHE 0 -#define OSCL_HAS_LARGE_FILE_SUPPORT 1 - -//For Sockets -#define OSCL_HAS_SYMBIAN_SOCKET_SERVER 0 -#define OSCL_HAS_SYMBIAN_DNS_SERVER 0 -#define OSCL_HAS_BERKELEY_SOCKETS 1 -#define OSCL_HAS_SOCKET_SUPPORT 1 - -//basic socket types -typedef int TOsclSocket; -typedef struct sockaddr_in TOsclSockAddr; -typedef socklen_t TOsclSockAddrLen; -typedef struct ip_mreq TIpMReq; - -//Init addr macro, inet_addr returns an uint32 -#define OsclValidInetAddr(addr) (inet_addr(addr)!=INADDR_NONE) - -//address conversion macro-- from string to network address. -#define OsclMakeSockAddr(sockaddr,port,addrstr,ok)\ - sockaddr.sin_family=OSCL_AF_INET;\ - sockaddr.sin_port=htons(port);\ - int32 result=inet_aton((const char*)addrstr,&sockaddr.sin_addr);\ - ok=(result!=0); - -//address conversion macro-- from network address to string -#define OsclUnMakeSockAddr(sockaddr,addrstr)\ - addrstr=inet_ntoa(sockaddr.sin_addr); -//address conversion macro-- from string to inaddr -#define OsclMakeInAddr(in_addr,addrstr,ok)\ - int32 result = inet_aton((const char*)addrstr, &in_addr);\ - ok=(result!=0); - -//address conversion macro-- from inaddr to string -#define OsclUnMakeInAddr(in_addr,addrstr)\ - addrstr=inet_ntoa(in_addr); - -//wrappers for berkeley socket calls -#define OsclSetRecvBufferSize(s,val,ok,err) \ - ok=(setsockopt(s,SOL_SOCKET,SO_RCVBUF,(char*)&val, sizeof(int)) !=-1);\ - if (!ok)err=errno - -#define OsclBind(s,addr,ok,err)\ - TOsclSockAddr* tmpadr = &addr;\ - sockaddr* sadr = OSCL_STATIC_CAST(sockaddr*, tmpadr);\ - ok=(bind(s,sadr,sizeof(addr))!=(-1));\ - if (!ok)err=errno - -#define OsclSetSockOpt(s,optLevel,optName,optVal,optLen,ok,err)\ - ok=(setsockopt(s,optLevel,optName,OSCL_STATIC_CAST(const char*,optVal),optLen) != (-1));\ - if (!ok)err=errno -#define OsclJoin(s,addr,ok,err)\ -{\ - struct ip_mreq mreq; \ - void* p = &addr; \ - ok=(bind(s,(sockaddr*)p,sizeof(addr))!=(-1));\ - mreq.imr_multiaddr.s_addr = addr.sin_addr.s_addr ; \ - mreq.imr_interface.s_addr = htonl(INADDR_ANY); \ - ok=(setsockopt(s, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(struct ip_mreq))!=(-1)); \ - if (!ok)err=errno;\ -} - - -#define OsclListen(s,size,ok,err)\ - ok=(listen(iSocket,qSize)!=(-1));\ - if (!ok)err=errno - -#define OsclAccept(s,accept_s,ok,err,wouldblock)\ - accept_s=accept(s,NULL,NULL);\ - ok=(accept_s!=(-1));\ - if (!ok){err=errno;wouldblock=(err==EAGAIN||err==EWOULDBLOCK);} - -#define OsclSetNonBlocking(s,ok,err)\ - ok=(fcntl(s,F_SETFL,O_NONBLOCK)!=(-1));\ - if (!ok)err=errno - -#define OsclShutdown(s,how,ok,err)\ - ok=(shutdown(iSocket,how)!=(-1));\ - if (!ok)err=errno - -#define OsclSocket(s,fam,type,prot,ok,err)\ - s=socket(fam,type,prot);\ - ok=(s!=(-1));\ - if (!ok)err=errno - -#define OsclSendTo(s,buf,len,addr,ok,err,nbytes,wouldblock)\ - TOsclSockAddr* tmpadr = &addr;\ - sockaddr* sadr = OSCL_STATIC_CAST(sockaddr*, tmpadr);\ - nbytes=sendto(s,(const void*)(buf),(size_t)(len),0,sadr,(socklen_t)sizeof(addr));\ - ok=(nbytes!=(-1));\ - if (!ok){err=errno;wouldblock=(err==EAGAIN||err==EWOULDBLOCK);} - -#define OsclSend(s,buf,len,ok,err,nbytes,wouldblock)\ - nbytes=send(s,(const void*)(buf),(size_t)(len),0);\ - ok=(nbytes!=(-1));\ - if (!ok){err=errno;wouldblock=(err==EAGAIN||err==EWOULDBLOCK);} - -#define OsclCloseSocket(s,ok,err)\ - ok=(close(s)!=(-1));\ - if (!ok)err=errno - -#define OsclConnect(s,addr,ok,err,wouldblock)\ - TOsclSockAddr* tmpadr = &addr;\ - sockaddr* sadr = OSCL_STATIC_CAST(sockaddr*, tmpadr);\ - ok=(connect(s,sadr,sizeof(addr))!=(-1));\ - if (!ok){err=errno;wouldblock=(err==EINPROGRESS);} -#define OsclGetPeerName(s,name,namelen,ok,err)\ - ok=(getpeername(s,(sockaddr*)&name,(socklen_t*)&namelen) != (-1) );\ - if (!ok)err=errno - -#define OsclGetAsyncSockErr(s,ok,err)\ - int opterr;socklen_t optlen=sizeof(opterr);\ - ok=(getsockopt(s,SOL_SOCKET,SO_ERROR,(void *)&opterr,&optlen)!=(-1));\ - if(ok)err=opterr;else err=errno; - -#define OsclPipe(x) pipe(x) -#define OsclReadFD(fd,buf,cnt) read(fd,buf,cnt) -#define OsclWriteFD(fd,buf,cnt) write(fd,buf,cnt) - -//unix reports connect completion in write set in the getsockopt -//error. -#define OsclConnectComplete(s,wset,eset,success,fail,ok,err)\ - success=fail=false;\ - if (FD_ISSET(s,&eset))\ - {fail=true;OsclGetAsyncSockErr(s,ok,err);}\ - else if (FD_ISSET(s,&wset))\ - {OsclGetAsyncSockErr(s,ok,err);if (ok && err==0)success=true;else fail=true;} - -#define OsclRecv(s,buf,len,ok,err,nbytes,wouldblock)\ - nbytes=recv(s,(void *)(buf),(size_t)(len),0);\ - ok=(nbytes!=(-1));\ - if (!ok){err=errno;wouldblock=(err==EAGAIN);} - -#define OsclRecvFrom(s,buf,len,paddr,paddrlen,ok,err,nbytes,wouldblock)\ -{\ -void* p=paddr;\ -nbytes=recvfrom(s,(void*)(buf),(size_t)(len),0,(struct sockaddr*)p,paddrlen);\ - ok=(nbytes!=(-1));\ - if (!ok){err=errno;wouldblock=(err==EAGAIN);}\ -} - - -#define OsclSocketSelect(nfds,rd,wr,ex,timeout,ok,err,nhandles)\ - nhandles=select(nfds,&rd,&wr,&ex,&timeout);\ - ok=(nhandles!=(-1));\ - if (!ok)err=errno - -//there's not really any socket startup needed on unix, but -//you need to define a signal handler for SIGPIPE to avoid -//broken pipe crashes. -#define OsclSocketStartup(ok)\ - signal(SIGPIPE,SIG_IGN);\ - ok=true - -#define OsclSocketCleanup(ok)\ - signal(SIGPIPE,SIG_DFL);\ - ok=true - -//hostent type -typedef struct hostent TOsclHostent; - -//wrapper for gethostbyname -#define OsclGethostbyname(name,hostent,ok,err)\ - hostent=gethostbyname((const char*)name);\ - ok=(hostent!=NULL);\ - if (!ok)err=errno; - -//extract dotted address from a hostent -#define OsclGetDottedAddr(hostent,dottedaddr,ok)\ - long *_hostaddr=(long*)hostent->h_addr_list[0];\ - struct in_addr _inaddr;\ - _inaddr.s_addr=*_hostaddr;\ - dottedaddr=inet_ntoa(_inaddr);\ - ok=(dottedaddr!=NULL); - -//extract dotted address from a hostent into the vector of OsclNetworkAddress -#define OsclGetDottedAddrVector(hostent,dottedaddr,dottedaddrvect,ok)\ - if(dottedaddrvect)\ - {\ - long **_addrlist=(long**)hostent->h_addr_list;\ - for(int i = 0; _addrlist[i] != NULL; i++){\ - struct in_addr _inaddr;\ - _inaddr.s_addr=*_addrlist[i];\ - OsclNetworkAddress addr(inet_ntoa(_inaddr), 0);\ - dottedaddrvect->push_back(addr);\ - }\ - if (!dottedaddrvect->empty())\ - {dottedaddr->port = dottedaddrvect->front().port; dottedaddr->ipAddr.Set(dottedaddrvect->front().ipAddr.Str());}\ - ok=(!dottedaddrvect->empty() && (((*dottedaddrvect)[0]).ipAddr.Str() != NULL));\ - }\ - else\ - {\ - char *add;\ - OsclGetDottedAddr(hostent,add,ok);\ - if(ok) dottedaddr->ipAddr.Set(add);\ - } - -//socket shutdown codes -#define OSCL_SD_RECEIVE SHUT_RD -#define OSCL_SD_SEND SHUT_WR -#define OSCL_SD_BOTH SHUT_RDWR - -//address family codes -#define OSCL_AF_INET AF_INET - -//socket type codes -#define OSCL_SOCK_STREAM SOCK_STREAM -#define OSCL_SOCK_DATAGRAM SOCK_DGRAM - -//IP protocol codes -#define OSCL_IPPROTO_IP IPPROTO_IP -#define OSCL_IPPROTO_TCP IPPROTO_TCP -#define OSCL_IPPROTO_UDP IPPROTO_UDP - -//Socket option Levels -#define OSCL_SOL_SOCKET SOL_SOCKET -#define OSCL_SOL_IP IPPROTO_IP -#define OSCL_SOL_TCP IPPROTO_TCP -#define OSCL_SOL_UDP IPPROTO_UDP - -//Socket Option Values (level = IP) -#define OSCL_SOCKOPT_IP_MULTICAST_TTL IP_MULTICAST_TTL -#define OSCL_SOCKOPT_IP_ADDMEMBERSHIP IP_ADD_MEMBERSHIP -#define OSCL_SOCKOPT_IP_TOS IP_TOS - -//Socket Option Values (level = Socket) -#define OSCL_SOCKOPT_SOL_REUSEADDR SO_REUSEADDR -//End sockets - -// file IO support -#if (OSCL_HAS_LARGE_FILE_SUPPORT) -typedef off64_t TOsclFileOffset; -#else -typedef int32 TOsclFileOffset; -#endif - -#include "osclconfig_io_check.h" - -#endif - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_io_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_io_check.h deleted file mode 100644 index 22ddebbd10..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_io_check.h +++ /dev/null @@ -1,605 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -#ifndef OSCLCONFIG_IO_CHECK_H_INCLUDED -#define OSCLCONFIG_IO_CHECK_H_INCLUDED - -/** -OSCL_HAS_ANSI_FILE_IO_SUPPORT macro should be set to 1 if -the target platform supports the ANSI C file I/O functions (fopen, fread, etc). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_FILE_IO_SUPPORT -#error "ERROR: OSCL_HAS_ANSI_FILE_IO_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_ANSI_64BIT_FILE_IO_SUPPORT macro should be set to 1 if -the target platform supports the 64-bit ANSI C file I/O functions (fopen, fread, etc). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_64BIT_FILE_IO_SUPPORT -#error "ERROR: OSCL_HAS_ANSI_64BIT_FILE_IO_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_MSWIN_FILE_IO_SUPPORT macro should be set to 1 if -the target platform supports the ANSI C file I/O functions (fopen, fread, etc). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_MSWIN_FILE_IO_SUPPORT -#error "ERROR: OSCL_HAS_MSWIN_FILE_IO_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SYMBIAN_COMPATIBLE_IO_FUNCTION macro should be set to 1 if -the target platform supports the Symbian file I/O functions (RFile, RFs). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_COMPATIBLE_IO_FUNCTION -#error "ERROR: OSCL_HAS_SYMBIAN_COMPATIBLE_IO_FUNCTION has to be defined to either 1 or 0" -#endif - -/** -On Symbian platforms only: -OSCL_HAS_NATIVE_DUPLICATE_FILE_HANDLE macro should be set to 1 if -the target platform supports the Symbian file I/O function RFile::Duplicate. -Otherwise it should be set to 0. -*/ -#if (OSCL_HAS_SYMBIAN_COMPATIBLE_IO_FUNCTION) -#ifndef OSCL_HAS_NATIVE_DUPLICATE_FILE_HANDLE -#error "ERROR: OSCL_HAS_NATIVE_DUPLICATE_FILE_HANDLE has to be defined to either 1 or 0" -#endif -#endif - - -/** -OSCL_HAS_NATIVE_FILE_CACHE_ENABLE macro should be set to 1 if -the target platform includes native file cache capability. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_NATIVE_FILE_CACHE_ENABLE -#error "ERROR: OSCL_HAS_NATIVE_FILE_CACHE_ENABLE has to be defined to either 1 or 0" -#endif - - -/** -OSCL_HAS_PV_FILE_CACHE macro should be set to 1 if -the target platform includes PV file cache capability. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_PV_FILE_CACHE -#error "ERROR: OSCL_HAS_PV_FILE_CACHE has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_LARGE_FILE_SUPPORT macro should be set to 1 if -the target platform supports more than 32bit file I/O capability. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_LARGE_FILE_SUPPORT -#error "ERROR: OSCL_HAS_LARGE_FILE_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -type TOsclFileOffset should be defined as the type used for file size -and offsets on the target platform. -Example: -typedef size_t TOsclFileOffset; -*/ -typedef TOsclFileOffset __verify__TOsclFileOffset__defined__; - - -/** -OSCL_FILE_BUFFER_MAX_SIZE macro should be set to -the desired size of the file I/O cache in bytes. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_FILE_BUFFER_MAX_SIZE -#error "ERROR: OSCL_FILE_BUFFER_MAX_SIZE has to be defined to a numeric value" -#endif - -/** -OSCL_HAS_SOCKET_SUPPORT macro should be set to 1 if -the target platform supports sockets of any type. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SOCKET_SUPPORT -#error "ERROR: OSCL_HAS_SOCKET_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SYMBIAN_SOCKET_SERVER macro should be set to -1 if the platform supports Symbian socket API (RSocket, RSocketServ). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_SOCKET_SERVER -#error "ERROR: OSCL_HAS_SYMBIAN_SOCKET_SERVER has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SYMBIAN_DNS_SERVER macro should be set to -1 if the platform supports Symbian Host Resolver API (RHostResolver). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_DNS_SERVER -#error "ERROR: OSCL_HAS_SYMBIAN_DNS_SERVER has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_BERKELEY_SOCKETS macro should be set to -1 if the platform supports Berkeley style socket API, including -non-blocking I/O and a 'select' call. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_BERKELEY_SOCKETS -#error "ERROR: OSCL_HAS_BERKELEY_SOCKETS has to be defined to either 1 or 0" -#endif - -/** -For platforms with Berkeley type sockets, -TOsclSocket typedef should be set to platform native socket type. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -typedef TOsclSocket __TOsclSocketCheck___; -#endif - -/** -For platforms with Berkeley type sockets, -TOsclSockAddr typedef should be set to platform native socket address type. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -typedef TOsclSockAddr __TOsclSockAddrCheck___; -#endif - -/** -For platforms with Berkeley type sockets, -TOsclSockAddrLen typedef should be set to platform native socket address -length type. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -typedef TOsclSockAddrLen __TOsclSockAddrLenCheck___; -#endif - -/** -For platforms with Berkeley type sockets, -OsclBind(s,addr,ok,err) must be defined to -an expression that does a bind call. -'s' and 'addr' are the socket and address parameters -to the bind command. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false and 'err' must be set -to the bind error. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclBind -#error "ERROR: OsclBind(s,addr,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclListen(s,size,ok,err) must be defined to -an expression that does a listen call and sets 'ok' and 'err' -to indicate the result. -'s' and 'size' are the socket and queue size args to the listen -call. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false and 'err' must be set -to the listen error. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclListen -#error "ERROR: OsclListen(s,size,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclAccept(s,accept_s,ok,err,wouldblock) must be defined to -an expression that does an accept call and sets 'ok', 'err', -and 'wouldblock' to indicate the result. -'s' and 'accept_s' are the socket and accept socket args to the -accept call. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false and 'err' must be set -to the accept error. Additionally 'wouldblock' must be set to true -if the error code indicates that the socket is non-blocking and -would block, or to false otherwise. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclAccept -#error "ERROR: OsclAccept(s,accept_s,ok,err,wouldblock) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclSetNonBlocking(s,ok,err) must be defined to -an expression that sets socket 's' to non-blocking I/O mode -and sets 'ok' and 'err' to indicate the result. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false and 'err' must be set -to the error. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclSetNonBlocking -#error "ERROR: OsclSetNonBlocking(s,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclShutdown(s,how,ok,err) must be defined to -an expression that does a shutdown call and sets 'ok' and 'err' -to indicate the result. -'s' and 'how' are the socket and shutdown type args to the -shutdown call. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false and 'err' must be set -to the shutdown error. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclShutdown -#error "ERROR: OsclShutdown(s,how,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclSocket(s,fam,type,prot,ok,err) must be defined to -an expression that does a socket creation call and sets 'ok' -and 'err' to indicate the result. -'s', 'fam', 'type', and 'prot' are the socket, family, type, and -protocol args to the socket call. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false and 'err' must be set -to the socket error. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclSocket -#error "ERROR: OsclSocket(s,fam,type,prot,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclSendTo(s,buf,len,addr,ok,err,nbytes,wouldblock) must be defined -to an expression that does a sendto call and sets 'ok, 'err', 'nbytes', -and 'wouldblock' to indicate the result. -'s', 'buf', 'len', 'flags' and 'addr' are the arguments to the sendto -call. -On success, 'ok' must be set to true, and 'nbytes' must be set to -the number of bytes sent. -On failure, 'ok' must be set to false 'err' must be set -to the socket error. Additionally 'wouldblock' must be set to true -if the error code indicates that the socket is non-blocking and -would block, or to false otherwise. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclSendTo -#error "ERROR: OsclSendTo(s,buf,len,flags,addr,ok,err,nbytes,wouldblock) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclSend(s,buf,len,ok,err,nbytes,wouldblock) must be defined to -an expression that does a send operation and sets 'ok, 'err', 'nbytes', -and 'wouldblock' to indicate the result. -'s', 'buf', and 'len' are the args to the send call. -On success, 'ok' must be set to true, and 'nbytes' must be set to -the number of bytes sent. -On failure, 'ok' must be set to false 'err' must be set -to the socket error. Additionally 'wouldblock' must be set to true -if the error code indicates that the socket is non-blocking and -would block, or to false otherwise. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclSend -#error "ERROR: OsclSend(s,buf,len,ok,err,nbytes,wouldblock) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclCloseSocket(s,ok,err) must be defined to -an expression that closes socket 's' and sets 'ok and 'err' -to indicate the result. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false and 'err' must be set -to the close error. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclCloseSocket -#error "ERROR: OsclCloseSocket(s,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclConnect(s,addr,ok,err,wouldblock) must be defined to -an expression that does a connect call and sets 'ok', 'err', -and 'wouldblock' to indicate the result. -'s' and 'addr' are the socket and address args to the connect call. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false 'err' must be set -to the socket error. Additionally 'wouldblock' must be set to true -if the error code indicates that the socket is non-blocking and -would block, or to false otherwise. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclConnect -#error "ERROR: OsclConnect(s,addr,ok,err,wouldblock) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclConnectComplete(s,wset,eset,success,fail,ok,err) must be set -to an expression that checks for completion of a connect operation -on a non-blocking socket and sets 'success', 'fail', 'ok', and 'err' -to indicate the result. -'s' is the socket, 'wset' is the write set from the select call, -'eset' is the exception set from the select call. -If connect is not yet complete, 'success' and 'fail' must be -set false. -On connect success, 'success' must be set true. -On conneect failure, 'success' must be set false, 'fail' must be -set true. Additionally, the call attempts to retrieve the connect error. -If the connect error is obtained, 'ok' is set true and 'err' contains -the error. If the connect error is not obtained, 'ok' is set false -and 'err' is the error code from the attempt. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclConnectComplete -#error "ERROR: OsclConnectComplete(s,wset,eset,success,fail,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclRecv(s,buf,len,ok,err,nbytes,wouldblock) must be defined to -an expression that does a recv call and sets 'ok', 'err', 'nbytes', -and 'wouldblock' to indicate the result. -'s', 'buf', and 'len' are the arguments to the recv call. -On success, 'ok' must be set to true, and 'nbytes' must be set to -the number of bytes received. -On failure, 'ok' must be set to false 'err' must be set -to the socket error. Additionally 'wouldblock' must be set to true -if the error code indicates that the socket is non-blocking and -would block, or to false otherwise. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclRecv -#error "ERROR: OsclRecv(s,buf,len,ok,err,nbytes,wouldblock) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclRecvFrom(s,buf,len,addr,addrlen,ok,err,nbytes,wouldblock) must be defined to -an expression that does a recvfrom call and sets 'ok', 'err', 'nbytes', -and 'wouldblock' to indicate the result. -'s', 'buf', 'len', 'paddr', and 'paddrlen' are the arguments to the recvfrom call. -On success, 'ok' must be set to true, 'nbytes' must be set to -the number of bytes received, and 'paddr' must be set to the source address. -On failure, 'ok' must be set to false 'err' must be set -to the socket error. Additionally 'wouldblock' must be set to true -if the error code indicates that the socket is non-blocking and -would block, or to false otherwise. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclRecvFrom -#error "ERROR: OsclRecvFrom(s,buf,len,paddr,paddrlen,ok,err,nbytes,wouldblock) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclSocketSelect(nfds,rd,wr,ex,timeout,ok,err,nhandles) must be defined to -an expression that does a select call and sets 'ok', 'err', and -'nhandles' to indicate the result. -'nfds', 'rd', 'wr', 'ex', and 'timeout' are the arguments to the -select call. -On success, 'ok' must be set to true, and 'nhandles' must be set to -the number of socket handles with activitiy detected. -On failure, 'ok' must be set to false 'err' must be set -to the select error. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclSocketSelect -#error "ERROR: OsclSocketSelect(nfds,rd,wr,ex,timeout,ok,err,nhandles) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclSocketStartup(ok) must be defined to -an expression that does any necessary startup of the socket system -and sets 'ok' to indicate the result. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclSocketStartup -#error "ERROR: OsclSocketStartup(ok) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclSocketCleanup(ok) must be defined to -an expression that does any necessary cleanup of the socket system -and sets 'ok' to indicate the result. -On success, 'ok' must be set to true. -On failure, 'ok' must be set to false. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclSocketCleanup -#error "ERROR: OsclSocketCleanup(ok) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclGetAsyncSockErr(s,ok,err) must be defined to -an expression that does a getsockopt call to retrieve a socket error -and sets 'ok' and 'err' to indicate the result. -'s' is the socket argument to the getsockopt call. -On success, 'ok' must be set true and 'err' must be set to the -error retrieved. -On failure, 'ok' must be set false and 'err' must be set to the -error from the getsockopt call. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclGetAsyncSockErr -#error "ERROR: OsclGetAsyncSockErr(s,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -TOsclHostent typedef should be set to platform native hostent type. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -typedef TOsclHostent __TOsclHostentCheck___; -#endif - -/** -For platforms with Berkeley type sockets, -OsclGethostbyname(name,hostent,ok,err) must be defined to -an expression that does a gethostbyname call on host 'name' -and sets 'hostent', 'ok' and 'err' to indicate the result. -'name' is the name argument to the gethostbyname call. -On success, 'ok' must be set true and 'hostent' must be set to -the TOsclHostent* retrieved. -On failure, 'ok' must be set false and 'err' must be set to the -error from the gethostbyname call. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclGethostbyname -#error "ERROR: OsclGethostbyname(name,hostent,ok,err) has to be defined" -#endif -#endif - -/** -For platforms with Berkeley type sockets, -OsclGetDottedAddr(hostent,dottedaddr,ok) must be defined to -an expression that does extracts an address in dotted decimal -notation from a hostent structure. -'hostent' is the TOsclHostent*, -'dottedaddr' is a char* output containing the dotted address, -and 'ok' is a bool that should be set true on success, false on failure. -*/ -#if OSCL_HAS_BERKELEY_SOCKETS -#ifndef OsclGetDottedAddr -#error "ERROR: OsclGetDottedAddr(hostent,dottedaddr,ok) has to be defined" -#endif -#endif - - -/** -For platforms in which file descriptors created with a pipe() command can be -used with the select() system call the following 3 macros must be defined -*/ - -#if OSCL_HAS_SELECTABLE_PIPES -#ifndef OsclPipe -#error "ERROR: OsclPipe(pipearray) has to be defined" -#endif -#endif - -#if OSCL_HAS_SELECTABLE_PIPES -#ifndef OsclReadFD -#error "ERROR: OsclReadFD(fd,buffer,cnt) has to be defined" -#endif -#endif - -#if OSCL_HAS_SELECTABLE_PIPES -#ifndef OsclWriteFD -#error "ERROR: OsclWriteFD(fd,buffer,cnt) has to be defined" -#endif -#endif - -#if OSCL_HAS_SOCKET_SUPPORT -/** -OsclValidInetAddr must be defined to a boolean expression to -evaluate whether an address is proper IP4 format. -'addr' is a char* containing the address string. -*/ -#ifndef OsclValidInetAddr -#error "ERROR: OsclValidInetAddr(addr) must be defined" -#endif -#endif - -#if OSCL_HAS_SOCKET_SUPPORT -/** -OSCL_SD_RECEIVE, OSCL_SD_SEND, and OSCL_SD_BOTH must be defined to -the platform-specific socket shutdown codes. -*/ -#ifndef OSCL_SD_RECEIVE -#error "ERROR: OSCL_SD_RECEIVE has to be defined" -#endif -#ifndef OSCL_SD_SEND -#error "ERROR: OSCL_SD_SEND has to be defined" -#endif -#ifndef OSCL_SD_BOTH -#error "ERROR: OSCL_SD_BOTH has to be defined" -#endif -#endif - -#if OSCL_HAS_SOCKET_SUPPORT -/** -OSCL_AF_INET must be defined to the platform-specific -network address family codes for INET. -*/ -#ifndef OSCL_AF_INET -#error "ERROR: OSCL_AF_INET has to be defined" -#endif -#endif - -#if OSCL_HAS_SOCKET_SUPPORT -/** -OSCL_SOCK_STREAM and OSCL_SOCK_DATAGRAM must be defined to -the platform-specific socket type codes. -*/ -#ifndef OSCL_SOCK_STREAM -#error "ERROR: OSCL_SOCK_STREAM has to be defined" -#endif -#ifndef OSCL_SOCK_DATAGRAM -#error "ERROR: OSCL_SOCK_DATAGRAM has to be defined" -#endif -#endif - -#if OSCL_HAS_SOCKET_SUPPORT -/** -OSCL_IPPROTO_TCP and OSCL_IPPROTO_UDP must be defined to -the platform-specific IP protocol codes. -*/ -#ifndef OSCL_IPPROTO_TCP -#error "ERROR: OSCL_IPPROTO_TCP has to be defined" -#endif -#ifndef OSCL_IPPROTO_UDP -#error "ERROR: OSCL_IPPROTO_UDP has to be defined" -#endif -#endif - - -#endif // OSCLCONFIG_IO_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_ix86.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_ix86.h deleted file mode 100644 index 87d7afb43f..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_ix86.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G ( P L A T F O R M C O N F I G I N F O ) - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_ix86.h - * \brief This file contains configuration information for the ix86 processor family - * - */ - -#ifndef OSCLCONFIG_IX86_H_INCLUDED -#define OSCLCONFIG_IX86_H_INCLUDED - - -// Define macros for integer alignment and little endian byte order. -#define OSCL_INTEGERS_WORD_ALIGNED 1 -#define OSCL_BYTE_ORDER_BIG_ENDIAN 0 -#define OSCL_BYTE_ORDER_LITTLE_ENDIAN 1 - - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_lib.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_lib.h deleted file mode 100644 index ee71a6ad52..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_lib.h +++ /dev/null @@ -1,63 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ L I B ( P L A T F O R M C O N F I G I N F O ) - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_lib.h - \brief This file contains configuration information for the ANSI build. - -*/ - -#ifndef OSCLCONFIG_LIB_H_INCLUDED -#define OSCLCONFIG_LIB_H_INCLUDED - - - -//Set this to 1 to indicate this platform has oscllib support -#define OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT 1 -#define PV_RUNTIME_LIB_FILENAME_EXTENSION "so" - -//Set this to 1 to enable looking for debug versions of libraries. -//Use #ifndef to allow the compiler setting to override this definition -#ifndef OSCL_LIB_READ_DEBUG_LIBS -#if (OSCL_RELEASE_BUILD) -#define OSCL_LIB_READ_DEBUG_LIBS 0 -#else -#define OSCL_LIB_READ_DEBUG_LIBS 1 -#endif -#endif - -// The path recursively from which the config files are picked up -#ifndef PV_DYNAMIC_LOADING_CONFIG_FILE_PATH -#ifdef ANDROID -#define PV_DYNAMIC_LOADING_CONFIG_FILE_PATH "/system/etc" -#else -#define PV_DYNAMIC_LOADING_CONFIG_FILE_PATH "./" -#endif -#endif - -// check all osclconfig required macros are defined -#include "osclconfig_lib_check.h" - -#endif // OSCLCONFIG_LIB_H_INCLUDED - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_lib_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_lib_check.h deleted file mode 100644 index e4f7479eab..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_lib_check.h +++ /dev/null @@ -1,67 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -#ifndef OSCLCONFIG_LIB_CHECK_H_INCLUDED -#define OSCLCONFIG_LIB_CHECK_H_INCLUDED - -/*! \addtogroup osclconfig OSCL config - * - * @{ - */ - - - -/** -OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT should be set to 1 if the platform has basic explicit runtime DLL loading support. -*/ -#if !defined(OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT ) -#error "ERROR: OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT must be defined to 0 or 1" -#endif - -#if(OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT) -/** -** When OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT is 1, -** OSCL_LIB_READ_DEBUG_LIBS should be set to 0 or 1. Set to 1 to enable loading -** debug versions of libs. -*/ -#if !defined(OSCL_LIB_READ_DEBUG_LIBS) -#error "ERROR: OSCL_LIB_READ_DEBUG_LIBS must be defined to 0 or 1" -#endif - -/* -** When OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT is 1, -** PV_DYNAMIC_LOADING_CONFIG_FILE_PATH should be set. -*/ -#if !defined(PV_DYNAMIC_LOADING_CONFIG_FILE_PATH) -#error "ERROR: PV_DYNAMIC_LOADING_CONFIG_FILE_PATH must be set to a path where the config files are expected to be present" -#endif - -/* -** When OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT is 1, -** PV_RUNTIME_LIB_FILENAME_EXTENSION should be set. -*/ -#if !defined(PV_RUNTIME_LIB_FILENAME_EXTENSION) -#error "ERROR: PV_RUNTIME_LIB_FILENAME_EXTENSION must be specified for use as the dynamic library file extension" -#endif -#endif // OSCL_HAS_RUNTIME_LIB_LOADING_SUPPORT - -/*! @} */ - -#endif // OSCLCONFIG_LIB_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_limits_typedefs.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_limits_typedefs.h deleted file mode 100644 index 4ce355dfa4..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_limits_typedefs.h +++ /dev/null @@ -1,88 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G_ L I M I T S _ T Y P E D E F S - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_limits_typedefs.h - * \brief This file contains common typedefs based on the ANSI C limits.h header - * - * This header file should work for any ANSI C compiler to determine the - * proper native C types to use for OSCL integer types. - */ - - -#ifndef OSCLCONFIG_LIMITS_TYPEDEFS_H_INCLUDED -#define OSCLCONFIG_LIMITS_TYPEDEFS_H_INCLUDED - - -#include <limits.h> - -// determine if char is signed or unsigned -#if ( CHAR_MIN == 0 ) -#define OSCL_CHAR_IS_UNSIGNED 1 -#define OSCL_CHAR_IS_SIGNED 0 -#elif ( CHAR_MIN == SCHAR_MIN ) -#define OSCL_CHAR_IS_UNSIGNED 0 -#define OSCL_CHAR_IS_SIGNED 1 -#else -#error "Cannot determine if char is signed or unsigned" -#endif - - -#if ( (CHAR_MAX == 255) || (CHAR_MAX == 127) ) -typedef signed char int8; -typedef unsigned char uint8; -#else -#error "Cannot determine an 8-bit interger type" -#endif - - -#if ( SHRT_MAX == 32767 ) -typedef short int16; -typedef unsigned short uint16; - -#elif ( INT_MAX == 32767 ) -typedef int int16; -typedef unsigned int uint16; - -#else -#error "Cannot determine 16-bit integer type" -#endif - - - -#if ( INT_MAX == 2147483647 ) -typedef int int32; -typedef unsigned int uint32; - -#elif ( LONG_MAX == 2147483647 ) -typedef long int32; -typedef unsigned long uint32; - -#else -#error "Cannot determine 32-bit integer type" -#endif - - - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_memory.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_memory.h deleted file mode 100644 index b5c69d04ef..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_memory.h +++ /dev/null @@ -1,91 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ M E M O R Y - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - - - -#ifndef OSCLCONFIG_MEMORY_H_INCLUDED -#define OSCLCONFIG_MEMORY_H_INCLUDED - - -#ifndef OSCLCONFIG_H_INCLUDED -#include "osclconfig.h" -#endif - -#ifndef OSCLCONFIG_ANSI_MEMORY_H_INCLUDED -#include "osclconfig_ansi_memory.h" -#endif - -/* OSCL_HAS_GLOBAL_NEW_DELETE - Enables or disables the definition of overloaded - * global memory operators in oscl_mem.h - * - * Release Mode: OSCL_HAS_GLOBAL_NEW_DELETE 0 - * Debug Mode: OSCL_HAS_GLOBAL_NEW_DELETE 1 - */ - - -#if (OSCL_RELEASE_BUILD) -#define OSCL_BYPASS_MEMMGT 1 -#define OSCL_HAS_GLOBAL_NEW_DELETE 0 -#else -#define OSCL_BYPASS_MEMMGT 1 //Temporarily disabling -#define OSCL_HAS_GLOBAL_NEW_DELETE 1 -#endif - -/* PVMEM_INST_LEVEL - Memory leak instrumentation level enables the compilation - * of detailed memory leak info (filename + line number). - * PVMEM_INST_LEVEL 0: Release mode. - * PVMEM_INST_LEVEL 1: Debug mode. - */ - -#if(OSCL_RELEASE_BUILD) -#define PVMEM_INST_LEVEL 0 -#else -#define PVMEM_INST_LEVEL 1 -#endif - -#if(OSCL_HAS_GLOBAL_NEW_DELETE) -//Detect if <new> or <new.h> is included anyplace to avoid a compile error. -#if defined(_INC_NEW) -#error Duplicate New Definition! -#endif //_INC_NEW -#if defined(_NEW_) -#error Duplicate New Definition! -#endif //_NEW_ -#endif //OSCL_HAS_GLOBAL_NEW_DELETE - -#ifdef __cplusplus -#include <new> //for placement new -#endif //__cplusplus - -//OSCL_HAS_HEAP_BASE_SUPPORT - Enables or disables overloaded memory operators in HeapBase class -#define OSCL_HAS_HEAP_BASE_SUPPORT 1 - -#define OSCL_HAS_SYMBIAN_MEMORY_FUNCS 0 - - -#include "osclconfig_memory_check.h" - - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_memory_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_memory_check.h deleted file mode 100644 index 8903111292..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_memory_check.h +++ /dev/null @@ -1,72 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -#ifndef OSCLCONFIG_MEMORY_CHECK_H_INCLUDED -#define OSCLCONFIG_MEMORY_CHECK_H_INCLUDED - - -/** -OSCL_BYPASS_MEMMGT macro should be set to 1 if -it is desirable to bypass the PV memory management system and just -use the native memory management. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_BYPASS_MEMMGT -#error "ERROR: OSCL_BYPASS_MEMMGT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_ANSI_MEMORY_FUNCS macro should be set to 1 if -the target platform supports ANSI C memory functions (malloc, free, etc). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_MEMORY_FUNCS -#error "ERROR: OSCL_HAS_ANSI_MEMORY_FUNCS has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SYMBIAN_MEMORY_FUNCS macro should be set to 1 if -the target platform supports Symbian memory functions User::Alloc, User::Free, etc. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_MEMORY_FUNCS -#error "ERROR: OSCL_HAS_SYMBIAN_MEMORY_FUNCS has to be defined to either 1 or 0" -#endif - -/* - * OSCL_HAS_HEAP_BASE_SUPPORT macro should be set to 1 for the - * platforms that allows inheritance from HeapBase class for - * overloading of new/delete operators. - */ - -#ifndef OSCL_HAS_HEAP_BASE_SUPPORT -#error "ERROR: OSCL_HAS_HEAP_BASE_SUPPORT has to be defined to either 1 or 0." -#endif - -/* - * OSCL_HAS_GLOBAL_NEW_DELETE macro should be set to 1 for the - * platforms that allows overloading of new/delete operators. - */ - -#ifndef OSCL_HAS_GLOBAL_NEW_DELETE -#error "ERROR: OSCL_HAS_GLOBAL_NEW_DELETE has to be defined to either 1 or 0." -#endif - -#endif // OSCLCONFIG_MEMORY_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_no_os.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_no_os.h deleted file mode 100644 index c1a06e3316..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_no_os.h +++ /dev/null @@ -1,71 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -#ifndef OSCLCONFIG_NO_OS_H_INCLUDED -#define OSCLCONFIG_NO_OS_H_INCLUDED - -/*! \addtogroup osclconfig OSCL config - * - * @{ - */ - -//a file to turn off ALL os-specific switches. - -//osclconfig -#define OSCL_HAS_UNIX_SUPPORT 0 -#define OSCL_HAS_MSWIN_SUPPORT 0 -#define OSCL_HAS_MSWIN_PARTIAL_SUPPORT 0 -#define OSCL_HAS_SYMBIAN_SUPPORT 0 -#define OSCL_HAS_SAVAJE_SUPPORT 0 -#define OSCL_HAS_PV_C_OS_SUPPORT 0 -#define OSCL_HAS_ANDROID_SUPPORT 0 -#define OSCL_HAS_IPHONE_SUPPORT 0 - -//osclconfig_error -#define OSCL_HAS_SYMBIAN_ERRORTRAP 0 - -//osclconfig_memory -#define OSCL_HAS_SYMBIAN_MEMORY_FUNCS 0 -#define OSCL_HAS_PV_C_OS_API_MEMORY_FUNCS 0 - -//osclconfig_time -#define OSCL_HAS_PV_C_OS_TIME_FUNCS 0 -#define OSCL_HAS_UNIX_TIME_FUNCS 0 - -//osclconfig_util -#define OSCL_HAS_SYMBIAN_TIMERS 0 -#define OSCL_HAS_SYMBIAN_MATH 0 - -//osclconfig_proc -#define OSCL_HAS_SYMBIAN_SCHEDULER 0 -#define OSCL_HAS_SEM_TIMEDWAIT_SUPPORT 0 -#define OSCL_HAS_PTHREAD_SUPPORT 0 - -//osclconfig_io -#define OSCL_HAS_SYMBIAN_COMPATIBLE_IO_FUNCTION 0 -#define OSCL_HAS_SAVAJE_IO_SUPPORT 0 -#define OSCL_HAS_SYMBIAN_SOCKET_SERVER 0 -#define OSCL_HAS_SYMBIAN_DNS_SERVER 0 -#define OSCL_HAS_BERKELEY_SOCKETS 0 - - -/*! @} */ - -#endif // OSCLCONFIG_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc.h deleted file mode 100644 index 9f4396549a..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc.h +++ /dev/null @@ -1,43 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ P R O C ( P L A T F O R M C O N F I G I N F O ) - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_proc.h - * \brief This file contains configuration information for the linux platform - * - */ - -#ifndef OSCLCONFIG_PROC_H_INCLUDED -#define OSCLCONFIG_PROC_H_INCLUDED - -#ifndef OSCLCONFIG_H_INCLUDED -#include "osclconfig.h" -#endif - -#include "osclconfig_proc_unix_android.h" - -#include "osclconfig_proc_check.h" - - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_check.h deleted file mode 100644 index 0cba8f2556..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_check.h +++ /dev/null @@ -1,157 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -#ifndef OSCLCONFIG_PROC_CHECK_H_INCLUDED -#define OSCLCONFIG_PROC_CHECK_H_INCLUDED - -/** -OSCL_HAS_THREAD_SUPPORT macro should be set to 1 if -the target platform supports threads. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_THREAD_SUPPORT -#error "ERROR: OSCL_HAS_THREAD_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_NON_PREEMPTIVE_THREAD_SUPPORT macro should be set to 1 if -the target platform supports non-pre-emptive threads. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_NON_PREEMPTIVE_THREAD_SUPPORT -#error "ERROR: OSCL_HAS_NON_PREEMPTIVE_THREAD_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SYMBIAN_SCHEDULER macro should be set to 1 if -the target platform supports Symbian active object scheduler. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_SCHEDULER -#error "ERROR: OSCL_HAS_SYMBIAN_SCHEDULER has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SEM_TIMEDWAIT_SUPPORT macro should be set to 1 if -the target platform supports POSIX-compliant semaphores (semaphore.h) -with advanced realtime features including sem_timedwait. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SEM_TIMEDWAIT_SUPPORT -#error "ERROR: OSCL_HAS_SEM_TIMEDWAIT_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_PTHREAD_SUPPORT macro should be set to 1 if -the target platform supports POSIX-compliand pthreads (pthread.h). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_PTHREAD_SUPPORT -#error "ERROR: OSCL_HAS_PTHREAD_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -type TOsclThreadId should be defined as the type used as -a thread ID -on the target platform. -Example: -typedef DWORD TOsclThreadId; -*/ -typedef TOsclThreadId __verify__TOsclThreadId__defined__; - -/** -type TOsclThreadFuncRet should be defined as the type used as -a thread function return value -on the target platform. -Example: -typedef DWORD TOsclThreadFuncRet; -*/ -typedef TOsclThreadFuncRet __verify__TOsclThreadFuncRet__defined__; - -/** -type TOsclThreadFuncArg should be defined as the type used as -a thread function argument -on the target platform. -Example: -typedef LPVOID TOsclThreadFuncArg; -*/ -typedef TOsclThreadFuncArg __verify__TOsclThreadFuncArg__defined__; - -/** -OSCL_THREAD_DECL macro should be defined to the -necessary function declaration modifiers for thread routines, -or a null macro if no modifiers are needed. -Example: -#define OSCL_THREAD_DECL WINAPI -*/ -#ifndef OSCL_THREAD_DECL -#error "ERROR: OSCL_THREAD_DECL has to be defined." -#endif - -/** -Example of a declaration of a thread routine called MyThreadMain using -the Oscl definitions: - -static TOsclThreadFuncRet OSCL_THREAD_DECL MyThreadMain(TOsclThreadFuncArg arg); -*/ - -/** -type TOsclThreadObject should be defined as the type used as -a thread object or handle -on the target platform. -Example: -typedef pthread_t TOsclThreadObject; -*/ -typedef TOsclThreadObject __verify__TOsclThreadObject__defined__; - -/** -type TOsclMutexObject should be defined as the type used as -a mutex object or handle -on the target platform. -Example: -typedef pthread_mutex_t TOsclMutexObject; -*/ -typedef TOsclMutexObject __verify__TOsclMutexObject__defined__; - -/** -type TOsclSemaphoreObject should be defined as the type used as -a mutex object or handle -on the target platform. -Example: -typedef sem_t TOsclSemaphoreObject; -*/ -typedef TOsclSemaphoreObject __verify__TOsclSemaphoreObject__defined__; - -/** -type TOsclConditionObject should be defined as the type used as -a condition variable -on the target platform. -Example: -typedef pthread_cond_t TOsclConditionObject; - -Note: Condition variables are only used with certain semaphore implementations. -If the semaphore implementation does not require a condition variable, -then this type can be defined as 'int' as follows: -typedef int TOsclConditionObject; //not used -*/ -typedef TOsclConditionObject __verify__TOsclConditionObject__defined__; - - -#endif //OSCLCONFIG_PROC_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_unix_android.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_unix_android.h deleted file mode 100644 index c5d05eb4ef..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_unix_android.h +++ /dev/null @@ -1,60 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ P R O C ( P L A T F O R M C O N F I G I N F O ) - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_proc.h - * \brief This file contains configuration information for the linux platform - * - */ - -#ifndef OSCLCONFIG_PROC_UNIX_ANDROID_H_INCLUDED -#define OSCLCONFIG_PROC_UNIX_ANDROID_H_INCLUDED - -#define OSCL_HAS_SYMBIAN_SCHEDULER 0 - -#define OSCL_HAS_THREAD_SUPPORT 1 -#define OSCL_HAS_NON_PREEMPTIVE_THREAD_SUPPORT 0 - -//semaphore with advanced realtime features incl. timed wait. -#define OSCL_HAS_SEM_TIMEDWAIT_SUPPORT 0 -//#include <time.h> -//#include <semaphore.h> - -//pthreads -#define OSCL_HAS_PTHREAD_SUPPORT 1 -#include <pthread.h> -#include <errno.h> -#include <signal.h> - -// threads, mutex, semaphores -typedef pthread_t TOsclThreadId; -typedef void* TOsclThreadFuncArg; -typedef void* TOsclThreadFuncRet; -#define OSCL_THREAD_DECL -typedef pthread_t TOsclThreadObject; -typedef pthread_mutex_t TOsclMutexObject; -typedef int TOsclSemaphoreObject; -typedef pthread_cond_t TOsclConditionObject; - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_unix_common.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_unix_common.h deleted file mode 100644 index 104a2ccafe..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_proc_unix_common.h +++ /dev/null @@ -1,59 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ P R O C ( P L A T F O R M C O N F I G I N F O ) - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_proc.h - * \brief This file contains configuration information for the linux platform - * - */ - -#ifndef OSCLCONFIG_PROC_UNIX_COMMON_H_INCLUDED -#define OSCLCONFIG_PROC_UNIX_COMMON_H_INCLUDED - -#define OSCL_HAS_SYMBIAN_SCHEDULER 0 - -#define OSCL_HAS_THREAD_SUPPORT 1 -#define OSCL_HAS_NON_PREEMPTIVE_THREAD_SUPPORT 0 - -//semaphore with advanced realtime features incl. timed wait. -#define OSCL_HAS_SEM_TIMEDWAIT_SUPPORT 1 -#include <time.h> -#include <semaphore.h> - -//pthreads -#define OSCL_HAS_PTHREAD_SUPPORT 1 -#include <pthread.h> -#include <errno.h> - -// threads, mutex, semaphores -typedef pthread_t TOsclThreadId; -typedef void* TOsclThreadFuncArg; -typedef void* TOsclThreadFuncRet; -#define OSCL_THREAD_DECL -typedef pthread_t TOsclThreadObject; -typedef pthread_mutex_t TOsclMutexObject; -typedef sem_t TOsclSemaphoreObject; -typedef pthread_cond_t TOsclConditionObject; - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_time.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_time.h deleted file mode 100644 index cb5365906c..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_time.h +++ /dev/null @@ -1,50 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ T I M E ( T I M E - D E F I N I T I O N S ) - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - - - -#ifndef OSCLCONFIG_TIME_H_INCLUDED -#define OSCLCONFIG_TIME_H_INCLUDED - - -#ifndef OSCLCONFIG_H_INCLUDED -#include "osclconfig.h" -#endif - -// system header files -#include <time.h> // timeval -#include <sys/time.h> // timercmp -#include <unistd.h> - - - -#define OSCL_HAS_UNIX_TIME_FUNCS 1 - -typedef struct timeval OsclBasicTimeStruct; -typedef tm OsclBasicDateTimeStruct; - -#include "osclconfig_time_check.h" - -#endif diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_time_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_time_check.h deleted file mode 100644 index 0243d5c1f6..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_time_check.h +++ /dev/null @@ -1,47 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -//osclconfig: this build configuration file is for win32 -#ifndef OSCLCONFIG_TIME_CHECK_H_INCLUDED -#define OSCLCONFIG_TIME_CHECK_H_INCLUDED - - -/** -OSCL_HAS_UNIX_TIME_FUNCS macro should be set to 1 if -the target platform supports unix time of day functions. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_UNIX_TIME_FUNCS -#error "ERROR: OSCL_HAS_UNIX_TIME_FUNCS has to be defined to either 1 or 0" -#endif - -/** -OsclBasicTimeStruct type should be defined to the platform-specific -time of day type. -*/ -typedef OsclBasicTimeStruct __Validate__BasicTimeStruct__; - -/** -OsclBasicDateTimeStruct type should be defined to the platform-specific -date + time type. -*/ -typedef OsclBasicDateTimeStruct __Validate__BasicTimeDateStruct__; - -#endif //OSCLCONFIG_TIME_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_unix_android.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_unix_android.h deleted file mode 100644 index f4508ac48d..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_unix_android.h +++ /dev/null @@ -1,105 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ U N I X _ C O M M O N - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_limits_typedefs.h - * \brief This file contains common typedefs based on the ANSI C limits.h header - * - * This header file should work for any ANSI C compiler to determine the - * proper native C types to use for OSCL integer types. - */ - - -#ifndef OSCLCONFIG_UNIX_ANDROID_H_INCLUDED -#define OSCLCONFIG_UNIX_ANDROID_H_INCLUDED - - -// system header files -#include <stdlib.h> // abort -#include <stdarg.h> // va_list -#include <sys/types.h> -#include <stdio.h> -//#include <wchar.h> -#include <string.h> -#include <unistd.h> //for sleep -#include <pthread.h> -#include <ctype.h> // for tolower and toupper -#ifdef __cplusplus -#include <new> //for placement new -#endif -#include <math.h> - -#define OSCL_DISABLE_INLINES 0 - -#define OSCL_HAS_ANSI_STDLIB_SUPPORT 1 -#define OSCL_HAS_ANSI_MATH_SUPPORT 1 -#define OSCL_HAS_GLOBAL_VARIABLE_SUPPORT 1 -#define OSCL_HAS_ANSI_STRING_SUPPORT 1 -#define OSCL_HAS_ANSI_WIDE_STRING_SUPPORT 0 -#define OSCL_HAS_ANSI_STDIO_SUPPORT 1 - -#define OSCL_MEMFRAG_PTR_BEFORE_LEN 1 - -#define OSCL_HAS_UNIX_SUPPORT 1 -#define OSCL_HAS_MSWIN_SUPPORT 0 -#define OSCL_HAS_MSWIN_PARTIAL_SUPPORT 0 -#define OSCL_HAS_SYMBIAN_SUPPORT 0 -#define OSCL_HAS_IPHONE_SUPPORT 0 - - -// 64-bit int -#define OSCL_NATIVE_INT64_TYPE int64_t -#define OSCL_NATIVE_UINT64_TYPE uint64_t -#define INT64(x) x##LL -#define UINT64(x) x##ULL -#define INT64_HILO(high,low) ((((high##LL))<<32)|low) -#define UINT64_HILO(high,low) ((((high##ULL))<<32)|low) - -// character set. -#define OSCL_HAS_UNICODE_SUPPORT 1 -#define OSCL_NATIVE_WCHAR_TYPE wchar_t -#if (OSCL_HAS_UNICODE_SUPPORT) -#define _STRLIT(x) L ## x -#else -#define _STRLIT(x) x -#endif -#define _STRLIT_CHAR(x) x -#define _STRLIT_WCHAR(x) L ## x - -// Thread-local storage. Unix has keyed TLS. -#define OSCL_HAS_TLS_SUPPORT 1 -#define OSCL_TLS_IS_KEYED 1 -typedef pthread_key_t TOsclTlsKey ; -#define OSCL_TLS_KEY_CREATE_FUNC(key) (pthread_key_create(&key,NULL)==0) -#define OSCL_TLS_KEY_DELETE_FUNC(key) pthread_key_delete(key) -#define OSCL_TLS_STORE_FUNC(key,ptr) (pthread_setspecific(key,(const void*)ptr)==0) -#define OSCL_TLS_GET_FUNC(key) pthread_getspecific(key) - -//Basic lock -#define OSCL_HAS_BASIC_LOCK 1 -#include <pthread.h> -typedef pthread_mutex_t TOsclBasicLockObject; - -#endif // OSCLCONFIG_UNIX_COMMON_H_INCLUDED - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_unix_common.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_unix_common.h deleted file mode 100644 index d795c497cb..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_unix_common.h +++ /dev/null @@ -1,103 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2010 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -// -*- c++ -*- -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - -// O S C L C O N F I G _ U N I X _ C O M M O N - -// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - -/*! \file osclconfig_limits_typedefs.h - * \brief This file contains common typedefs based on the ANSI C limits.h header - * - * This header file should work for any ANSI C compiler to determine the - * proper native C types to use for OSCL integer types. - */ - - -#ifndef OSCLCONFIG_UNIX_COMMON_H_INCLUDED -#define OSCLCONFIG_UNIX_COMMON_H_INCLUDED - - -// system header files -#include <stdlib.h> // abort -#include <stdarg.h> // va_list -#include <sys/types.h> -#include <stdio.h> -#include <wchar.h> -#include <string.h> -#include <unistd.h> //for sleep -#include <pthread.h> -#include <ctype.h> // for tolower and toupper -#ifdef __cplusplus -#include <new> //for placement new -#endif -#include <math.h> - -#define OSCL_DISABLE_INLINES 0 - -#define OSCL_HAS_ANSI_STDLIB_SUPPORT 1 -#define OSCL_HAS_ANSI_MATH_SUPPORT 1 -#define OSCL_HAS_GLOBAL_VARIABLE_SUPPORT 1 -#define OSCL_HAS_ANSI_STRING_SUPPORT 1 -#define OSCL_HAS_ANSI_WIDE_STRING_SUPPORT 1 -#define OSCL_HAS_ANSI_STDIO_SUPPORT 1 - -#define OSCL_MEMFRAG_PTR_BEFORE_LEN 1 - -#define OSCL_HAS_UNIX_SUPPORT 1 -#define OSCL_HAS_MSWIN_SUPPORT 0 -#define OSCL_HAS_MSWIN_PARTIAL_SUPPORT 0 -#define OSCL_HAS_SYMBIAN_SUPPORT 0 - -// 64-bit int -#define OSCL_NATIVE_INT64_TYPE int64_t -#define OSCL_NATIVE_UINT64_TYPE uint64_t -#define INT64(x) x##LL -#define UINT64(x) x##ULL -#define INT64_HILO(high,low) ((((high##LL))<<32)|low) -#define UINT64_HILO(high,low) ((((high##ULL))<<32)|low) - -// character set. -#define OSCL_HAS_UNICODE_SUPPORT 1 -#define OSCL_NATIVE_WCHAR_TYPE wchar_t -#if (OSCL_HAS_UNICODE_SUPPORT) -#define _STRLIT(x) L ## x -#else -#define _STRLIT(x) x -#endif -#define _STRLIT_CHAR(x) x -#define _STRLIT_WCHAR(x) L ## x - -// Thread-local storage. Unix has keyed TLS. -#define OSCL_HAS_TLS_SUPPORT 1 -#define OSCL_TLS_IS_KEYED 1 -typedef pthread_key_t TOsclTlsKey ; -#define OSCL_TLS_KEY_CREATE_FUNC(key) (pthread_key_create(&key,NULL)==0) -#define OSCL_TLS_KEY_DELETE_FUNC(key) pthread_key_delete(key) -#define OSCL_TLS_STORE_FUNC(key,ptr) (pthread_setspecific(key,(const void*)ptr)==0) -#define OSCL_TLS_GET_FUNC(key) pthread_getspecific(key) - -//Basic lock -#define OSCL_HAS_BASIC_LOCK 1 -#include <pthread.h> -typedef pthread_mutex_t TOsclBasicLockObject; - -#endif // OSCLCONFIG_UNIX_COMMON_H_INCLUDED - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_util.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_util.h deleted file mode 100644 index a169848541..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_util.h +++ /dev/null @@ -1,43 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -#ifndef OSCLCONFIG_UTIL_H_INCLUDED -#define OSCLCONFIG_UTIL_H_INCLUDED - -#ifndef OSCLCONFIG_H_INCLUDED -#include "osclconfig.h" -#endif - -#include <stdio.h> //sprintf -#include <time.h> // OSCL clock -#include <sys/time.h> // timeval - -#define OSCL_CLOCK_HAS_DRIFT_CORRECTION 0 -#define OSCL_HAS_SYMBIAN_TIMERS 0 -#define OSCL_HAS_SYMBIAN_MATH 0 - -#define OSCL_RAND_MAX RAND_MAX - -//Define system sleep call for the tick count test here. -#include <unistd.h> -#define SLEEP_ONE_SEC sleep(1) - - -#include "osclconfig_util_check.h" - -#endif - diff --git a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_util_check.h b/tools/depends/target/libomxil-bellagio/oscl/osclconfig_util_check.h deleted file mode 100644 index f615c4a164..0000000000 --- a/tools/depends/target/libomxil-bellagio/oscl/osclconfig_util_check.h +++ /dev/null @@ -1,58 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ -#ifndef OSCLCONFIG_UTIL_CHECK_H_INCLUDED -#define OSCLCONFIG_UTIL_CHECK_H_INCLUDED - -/** -OSCL_HAS_SYMBIAN_TIMERS macro should be set to 1 if -the target platform supports Symbian timers (RTimer). -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_TIMERS -#error "ERROR: OSCL_HAS_SYMBIAN_TIMERS has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_SYMBIAN_MATH macro should be set to 1 if -the target platform supports Symbian <e32math.h> features. -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_SYMBIAN_MATH -#error "ERROR: OSCL_HAS_SYMBIAN_MATH has to be defined to either 1 or 0" -#endif - -/** -OSCL_HAS_ANSI_MATH_SUPPORT macro should be set to 1 if -the target platform supports the ANSI C math functions (math.h) -Otherwise it should be set to 0. -*/ -#ifndef OSCL_HAS_ANSI_MATH_SUPPORT -#error "ERROR: OSCL_HAS_ANSI_MATH_SUPPORT has to be defined to either 1 or 0" -#endif - -/** -OSCL_CLOCK_HAS_DRIFT_CORRECTION macro should be set to 1 if the target platform -has drift correction Otherwise it should be set to 0. -*/ -#ifndef OSCL_CLOCK_HAS_DRIFT_CORRECTION -#error "ERROR: OSCL_CLOCK_HAS_DRIFT_CORRECTION has to be defined to either 1 or 0" -#endif - -#endif // OSCLCONFIG_UTIL_CHECK_H_INCLUDED - - diff --git a/tools/depends/target/libxslt/Makefile b/tools/depends/target/libxslt/Makefile index 1ea6dba44c..3b51da45a1 100644 --- a/tools/depends/target/libxslt/Makefile +++ b/tools/depends/target/libxslt/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libxslt -VERSION=1.1.28 +VERSION=1.1.29 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz diff --git a/tools/depends/target/mdnsresponder/01-android-embedded.patch b/tools/depends/target/mdnsresponder/01-android-embedded.patch index e61c25390c..ceb400f9e1 100644 --- a/tools/depends/target/mdnsresponder/01-android-embedded.patch +++ b/tools/depends/target/mdnsresponder/01-android-embedded.patch @@ -1,7 +1,7 @@ diff -uPr ./mDNSCore/mDNSEmbeddedAPI.h ./mDNSCore/mDNSEmbeddedAPI.h --- ./mDNSCore/mDNSEmbeddedAPI.h 2012-10-24 01:18:23.000000000 +0200 +++ ./mDNSCore/mDNSEmbeddedAPI.h 2013-06-10 18:45:59.000000000 +0200 -@@ -1144,6 +1144,10 @@ +@@ -1328,6 +1328,10 @@ McastResolver_FlagNew = 2 }; @@ -252,7 +252,7 @@ diff -uPr ./mDNSShared/dnssd_clientshim.c ./mDNSShared/dnssd_clientshim.c // Allocate memory, and handle failure x = (mDNS_DirectOP_Browse *)mDNSPlatformMemAllocate(sizeof(*x)); -@@ -668,7 +683,7 @@ +@@ -674,7 +689,7 @@ x->q.ExpectUnique = mDNSfalse; x->q.ForceMCast = (flags & kDNSServiceFlagsForceMulticast) != 0; x->q.ReturnIntermed = (flags & kDNSServiceFlagsReturnIntermediates) != 0; @@ -264,7 +264,7 @@ diff -uPr ./mDNSShared/dnssd_clientshim.c ./mDNSShared/dnssd_clientshim.c diff -uPr ./mDNSShared/dns_sd.h ./mDNSShared/dns_sd.h --- ./mDNSShared/dns_sd.h 2013-04-10 01:08:48.000000000 +0200 +++ ./mDNSShared/dns_sd.h 2013-06-10 18:45:59.000000000 +0200 -@@ -93,7 +93,7 @@ +@@ -82,7 +82,7 @@ /* standard calling convention under Win32 is __stdcall */ /* Note: When compiling Intel EFI (Extensible Firmware Interface) under MS Visual Studio, the */ /* _WIN32 symbol is defined by the compiler even though it's NOT compiling code for Windows32 */ @@ -335,17 +335,17 @@ diff -uPr ./mDNSShared/PlatformCommon.c ./mDNSShared/PlatformCommon.c #if APPLE_OSX_mDNSResponder && LogTimeStamps extern mDNS mDNSStorage; extern mDNSu32 mDNSPlatformClockDivisor; -@@ -193,4 +205,5 @@ +@@ -199,4 +211,5 @@ #endif - syslog(syslog_level, "%s", buffer); + } } +#endif } diff -uPr ./mDNSShared/uds_daemon.h ./mDNSShared/uds_daemon.h --- ./mDNSShared/uds_daemon.h 2012-07-12 23:57:14.000000000 +0200 +++ ./mDNSShared/uds_daemon.h 2013-06-10 18:45:59.000000000 +0200 -@@ -22,6 +22,11 @@ - +@@ -15,6 +15,11 @@ + * limitations under the License. */ +#ifdef ANDROID @@ -359,7 +359,7 @@ diff -uPr ./mDNSShared/uds_daemon.h ./mDNSShared/uds_daemon.h diff -uPr ./mDNSWindows/mDNSWin32.c ./mDNSWindows/mDNSWin32.c --- ./mDNSWindows/mDNSWin32.c 2012-10-31 00:24:17.000000000 +0100 +++ ./mDNSWindows/mDNSWin32.c 2013-06-10 18:45:59.000000000 +0200 -@@ -2920,10 +2920,7 @@ +@@ -3024,10 +3024,7 @@ sa4.sin_family = AF_INET; sa4.sin_port = port.NotAnInteger; sa4.sin_addr.s_addr = ipv4.NotAnInteger; @@ -371,7 +371,7 @@ diff -uPr ./mDNSWindows/mDNSWin32.c ./mDNSWindows/mDNSWin32.c // Turn on option to receive destination addresses and receiving interface. option = 1; -@@ -2964,6 +2961,9 @@ +@@ -3068,6 +3065,9 @@ err = setsockopt( sock, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &option, sizeof( option ) ); check_translated_errno( err == 0, errno_compat(), kOptionErr ); @@ -381,7 +381,7 @@ diff -uPr ./mDNSWindows/mDNSWin32.c ./mDNSWindows/mDNSWin32.c } else if( inAddr->sa_family == AF_INET6 ) { -@@ -2981,10 +2981,7 @@ +@@ -3085,10 +3085,7 @@ sa6.sin6_flowinfo = 0; sa6.sin6_addr = sa6p->sin6_addr; sa6.sin6_scope_id = sa6p->sin6_scope_id; @@ -393,7 +393,7 @@ diff -uPr ./mDNSWindows/mDNSWin32.c ./mDNSWindows/mDNSWin32.c // Turn on option to receive destination addresses and receiving interface. option = 1; -@@ -3034,6 +3031,10 @@ +@@ -3138,6 +3135,10 @@ option = 255; err = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &option, sizeof( option ) ); check_translated_errno( err == 0, errno_compat(), kOptionErr ); diff --git a/tools/depends/target/mdnsresponder/Makefile b/tools/depends/target/mdnsresponder/Makefile index cc34558399..4ccfaba486 100644 --- a/tools/depends/target/mdnsresponder/Makefile +++ b/tools/depends/target/mdnsresponder/Makefile @@ -1,10 +1,10 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile +DEPS= ../../Makefile.include Makefile makefile.internal 01-android-embedded.patch # lib name, version LIBNAME=mDNSResponder -VERSION=379.37 +VERSION=625.41.2 OUTPUTNAME=libmDNSEmbedded SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz diff --git a/tools/depends/target/python27/Makefile b/tools/depends/target/python27/Makefile index d6a68bdd87..720811e77b 100644 --- a/tools/depends/target/python27/Makefile +++ b/tools/depends/target/python27/Makefile @@ -1,10 +1,10 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile Python-2.7.10-crosscompile.patch Python-2.7.10-android.patch Python-no-export-path.patch \ +DEPS= ../../Makefile.include Makefile Python-2.7.12-crosscompile.patch Python-2.7.10-android.patch Python-no-export-path.patch \ Python-setup.patch fix-datetime.patch Python-2.6.5-urllib.diff modules.setup make-fork-optional.patch # lib name, version LIBNAME=Python -VERSION=2.7.11 +VERSION=2.7.12 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.xz @@ -33,7 +33,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) echo $(NATIVEPREFIX) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p0 < ../Python-2.7.10-crosscompile.patch + cd $(PLATFORM); patch -p1 < ../Python-2.7.12-crosscompile.patch cd $(PLATFORM); patch -p0 < ../Python-setup.patch cd $(PLATFORM); patch -p0 < ../fix-datetime.patch cd $(PLATFORM); patch -p0 < ../Python-2.7.10-android.patch diff --git a/tools/depends/target/python27/Python-2.7.10-crosscompile.patch b/tools/depends/target/python27/Python-2.7.12-crosscompile.patch index c7c1c42949..b30e97240d 100644 --- a/tools/depends/target/python27/Python-2.7.10-crosscompile.patch +++ b/tools/depends/target/python27/Python-2.7.12-crosscompile.patch @@ -1,6 +1,7 @@ ---- Makefile.pre.in.orig 2015-05-23 18:09:16.000000000 +0200 -+++ Makefile.pre.in 2015-10-10 12:29:21.988926069 +0200 -@@ -238,6 +238,7 @@ +index dffc0b9..efc79ab 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -246,6 +246,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ ########################################################################## # Parser PGEN= Parser/pgen$(EXE) @@ -8,7 +9,7 @@ PSRCS= \ Parser/acceler.c \ -@@ -497,9 +498,9 @@ +@@ -544,9 +545,9 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o *\ -s*|s*) quiet="-q";; \ *) quiet="";; \ esac; \ @@ -20,16 +21,7 @@ # Build static library # avoid long command lines, same as LIBRARY_OBJS -@@ -636,7 +637,7 @@ - $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) - @$(MKDIR_P) Include - $(MAKE) $(PGEN) -- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) - $(MAKE) $(GRAMMAR_H) - touch $(GRAMMAR_C) -@@ -1072,12 +1073,12 @@ +@@ -1132,12 +1133,12 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -44,7 +36,7 @@ $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ -@@ -1205,11 +1206,13 @@ +@@ -1265,11 +1266,13 @@ libainstall: all python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -61,9 +53,31 @@ -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py* # Here are a couple of targets for MacOSX again, to install a full ---- setup.py.orig 2015-05-23 18:09:25.000000000 +0200 -+++ setup.py 2015-10-10 12:29:22.000925764 +0200 -@@ -17,7 +17,7 @@ +diff --git a/configure.ac b/configure.ac +index 06c877b..de26012 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -326,7 +326,6 @@ then + *) + # for now, limit cross builds to known configurations + MACHDEP="unknown" +- AC_MSG_ERROR([cross build not supported for $host]) + esac + ac_sys_release= + else +@@ -372,7 +371,6 @@ if test "$cross_compiling" = yes; then + *) + # for now, limit cross builds to known configurations + MACHDEP="unknown" +- AC_MSG_ERROR([cross build not supported for $host]) + esac + _PYTHON_HOST_PLATFORM="$MACHDEP${_host_cpu:+-$_host_cpu}" + fi +diff --git a/setup.py b/Python-2.7.12/setup.py +index aa08ada..f21e349 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,7 +17,7 @@ from distutils.command.install import install from distutils.command.install_lib import install_lib from distutils.spawn import find_executable @@ -72,7 +86,7 @@ def get_platform(): # cross build -@@ -162,6 +162,7 @@ +@@ -178,6 +178,7 @@ class PyBuildExt(build_ext): def build_extensions(self): @@ -80,7 +94,7 @@ # Detect which modules should be compiled missing = self.detect_modules() -@@ -326,6 +327,9 @@ +@@ -342,6 +343,9 @@ class PyBuildExt(build_ext): # Don't try to load extensions for cross builds if cross_compiling: @@ -90,7 +104,7 @@ return try: -@@ -480,7 +484,7 @@ +@@ -496,7 +500,7 @@ class PyBuildExt(build_ext): for directory in reversed(options.dirs): add_dir_to_list(dir_list, directory) @@ -99,7 +113,7 @@ and not sysconfig.get_config_var('PYTHONFRAMEWORK'): # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework # (PYTHONFRAMEWORK is set) to avoid # linking problems when -@@ -556,6 +560,11 @@ +@@ -572,6 +576,11 @@ class PyBuildExt(build_ext): if host_platform in ['darwin', 'beos']: math_libs = [] @@ -111,7 +125,7 @@ # XXX Omitted modules: gl, pure, dl, SGI-specific modules # -@@ -2028,8 +2037,13 @@ +@@ -2048,8 +2057,13 @@ class PyBuildExt(build_ext): # Pass empty CFLAGS because we'll just append the resulting # CFLAGS to Python's; -g or -O2 is to be avoided. @@ -127,21 +141,3 @@ res = os.system(cmd) if res or not os.path.exists(ffi_configfile): ---- configure.ac.orig 2015-10-10 13:10:34.139980182 +0200 -+++ configure.ac 2015-10-10 13:11:00.715341145 +0200 -@@ -325,7 +325,6 @@ - *) - # for now, limit cross builds to known configurations - MACHDEP="unknown" -- AC_MSG_ERROR([cross build not supported for $host]) - esac - ac_sys_release= - else -@@ -371,7 +370,6 @@ - *) - # for now, limit cross builds to known configurations - MACHDEP="unknown" -- AC_MSG_ERROR([cross build not supported for $host]) - esac - _PYTHON_HOST_PLATFORM="$MACHDEP${_host_cpu:+-$_host_cpu}" - fi diff --git a/tools/depends/target/python27/Python-no-export-path.patch b/tools/depends/target/python27/Python-no-export-path.patch index 6c486ccc4a..ec7278bb15 100644 --- a/tools/depends/target/python27/Python-no-export-path.patch +++ b/tools/depends/target/python27/Python-no-export-path.patch @@ -1,6 +1,6 @@ --- Makefile.pre.in.orig 2015-10-09 19:10:15.042905069 +0200 +++ Makefile.pre.in 2015-10-09 19:11:01.513642241 +0200 -@@ -1100,8 +1100,6 @@ +@@ -1160,8 +1160,6 @@ $(srcdir)/Lib/$(PLATDIR): mkdir $(srcdir)/Lib/$(PLATDIR) cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen diff --git a/tools/depends/target/python27/Python-setup.patch b/tools/depends/target/python27/Python-setup.patch index e9ff0c2de5..da1a59052f 100644 --- a/tools/depends/target/python27/Python-setup.patch +++ b/tools/depends/target/python27/Python-setup.patch @@ -1,6 +1,6 @@ --- setup.py.orig 2015-10-07 16:32:16.219083585 +0200 +++ setup.py 2015-10-07 16:41:48.563085871 +0200 -@@ -321,6 +321,9 @@ +@@ -337,6 +337,9 @@ self.announce('WARNING: skipping import check for Cygwin-based "%s"' % ext.name) return @@ -10,7 +10,7 @@ ext_filename = os.path.join( self.build_lib, self.get_ext_filename(self.get_ext_fullname(ext.name))) -@@ -335,27 +338,30 @@ +@@ -351,27 +354,30 @@ try: imp.load_dynamic(ext.name, ext_filename) except ImportError, why: diff --git a/tools/depends/target/python27/fix-ffi.patch b/tools/depends/target/python27/fix-ffi.patch index 270ac0a62b..e1c3bf25c7 100644 --- a/tools/depends/target/python27/fix-ffi.patch +++ b/tools/depends/target/python27/fix-ffi.patch @@ -1,6 +1,6 @@ --- Modules/_ctypes/malloc_closure.c.orig 2015-10-11 20:37:30.534378131 +0200 +++ Modules/_ctypes/malloc_closure.c 2015-10-11 20:38:57.322381368 +0200 -@@ -93,6 +93,7 @@ +@@ -89,6 +89,7 @@ /******************************************************************/ /* put the item back into the free list */ @@ -8,7 +8,7 @@ void ffi_closure_free(void *p) { ITEM *item = (ITEM *)p; -@@ -100,7 +101,6 @@ +@@ -96,7 +97,6 @@ free_list = item; } @@ -16,14 +16,14 @@ void *ffi_closure_alloc(size_t ignored, void** codeloc) { ITEM *item; -@@ -113,3 +113,4 @@ +@@ -109,3 +109,4 @@ *codeloc = (void *)item; return (void *)item; } +*/ --- Modules/_ctypes/cfield.c.orig 2015-10-11 20:34:03.034370393 +0200 +++ Modules/_ctypes/cfield.c 2015-10-11 20:37:04.462377159 +0200 -@@ -1724,6 +1724,7 @@ +@@ -1725,6 +1725,7 @@ */ /* align and size are bogus for void, but they must not be zero */ @@ -31,7 +31,7 @@ ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID }; ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 }; -@@ -1740,14 +1741,14 @@ +@@ -1741,14 +1742,14 @@ ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT }; ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE }; |
