diff --git a/README.ios b/README.ios index 287638cd7a5d0..ddded236324e5 100644 --- a/README.ios +++ b/README.ios @@ -14,7 +14,7 @@ TOC ----------------------------------------------------------------------------- This is a platform port of XBMC for the Apple iOS operating system. -The current build system is Xcode 3.2.5 and iOS SDK 4.2 +The current build system is Xcode 3.x and iOS SDK 4.2/4.3 There are two ways to build XBMC for Mac. 1) command-line or @@ -51,7 +51,10 @@ The preferred version is Xcode 3.2.5 and iOS SDK 4.2. $ cd $HOME/XBMC $ sudo mkdir -p /usr/local/bin; sudo cp tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/ - $ make -C tools/osx/ios-depends + $ cd tools/darwin/depends + $ ./bootstrap + $ ./configure --with-darwin=ios + $ make ----------------------------------------------------------------------------- 4. How to compile @@ -60,7 +63,7 @@ Both Xcode and Terminal compilation require that build environment be setup from the step 3.1. $ cd $HOME/XBMC - $ make -C tools/osx/ios-depends/xbmc + $ make -C tools/darwin/depends/xbmc $ make clean $ make xcode_depends diff --git a/README.osx b/README.osx index 62e2562454e7e..b4f9990129213 100644 --- a/README.osx +++ b/README.osx @@ -49,7 +49,10 @@ if you are running a previous Xcode 3.x version. Xcode 3.x only runs on 10.5. ----------------------------------------------------------------------------- $ cd $HOME/XBMC - $ make -C tools/osx/osx-depends + $ cd tools/darwin/depends + $ ./bootstrap + $ ./configure --with-darwin=osx + $ make ----------------------------------------------------------------------------- 4. How to compile @@ -58,7 +61,7 @@ Both Xcode and Terminal compilation require that build environment be setup first. This is a simple step and involves the following: $ cd $HOME/XBMC - $ make -C tools/osx/osx-depends/xbmc + $ make -C tools/darwin/depends/xbmc $ make clean $ make xcode_depends @@ -137,7 +140,7 @@ distribution. 1. build XBMC.app from XCode so that the application bundle is correctly updated. - 2. make -C tools/PackageMaker/ + 2. make -C tools/darwin/packaging/xbmc-osx 3. If completed successfully, a disk image named XBMC_for_Mac.dmg will be present in the users XBMC build directory: diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj index b62edeb14b738..f96b3224c99da 100644 --- a/XBMC-ATV2.xcodeproj/project.pbxproj +++ b/XBMC-ATV2.xcodeproj/project.pbxproj @@ -6837,7 +6837,7 @@ TARGETED_DEVICE_FAMILY = "2,3"; USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6"; WRAPPER_EXTENSION = frappliance; - XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7"; + XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_armv7"; }; name = Debug; }; @@ -6928,7 +6928,7 @@ TARGETED_DEVICE_FAMILY = "2,3"; USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6"; WRAPPER_EXTENSION = frappliance; - XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7"; + XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_armv7"; }; name = Release; }; diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj index a8d20cbd1da4f..4f89f4e7c3e03 100644 --- a/XBMC-IOS.xcodeproj/project.pbxproj +++ b/XBMC-IOS.xcodeproj/project.pbxproj @@ -6853,7 +6853,7 @@ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6"; VALIDATE_PRODUCT = NO; WRAPPER_EXTENSION = app; - XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7"; + XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_armv7"; }; name = Debug; }; @@ -6943,7 +6943,7 @@ USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6"; VALIDATE_PRODUCT = NO; WRAPPER_EXTENSION = app; - XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7"; + XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_armv7"; }; name = Release; }; diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index 3c6ae56f8f693..12aeae7168a9d 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -7133,7 +7133,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n# force TARGET_NAME on ppc\nTARGET_NAME=$PRODUCT_NAME\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi"; + shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n# force TARGET_NAME on ppc\nTARGET_NAME=$PRODUCT_NAME\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin/runtime\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/darwin/runtime\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi"; }; F5A1CBDF0F6B0B4700A96ABD /* copy frameworks */ = { isa = PBXShellScriptBuildPhase; @@ -7176,7 +7176,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi"; + shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin/runtime\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/darwin/runtime\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/tools/PackageMaker/XBMC Package.pmdoc/01xbmc-contents.xml b/tools/PackageMaker/XBMC Package.pmdoc/01xbmc-contents.xml deleted file mode 100644 index 6eb39c4b8c5e2..0000000000000 --- a/tools/PackageMaker/XBMC Package.pmdoc/01xbmc-contents.xml +++ /dev/null @@ -1 +0,0 @@ -modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file diff --git a/tools/PackageMaker/XBMC Package.pmdoc/01xbmc.xml b/tools/PackageMaker/XBMC Package.pmdoc/01xbmc.xml deleted file mode 100644 index ac78e281d09f6..0000000000000 --- a/tools/PackageMaker/XBMC Package.pmdoc/01xbmc.xml +++ /dev/null @@ -1 +0,0 @@ -org.xbmc.xbmcForMac.pkg2../../build/Release/XBMC.app/ApplicationsallowRevertparentinstallToinstallTo.pathinstallTo.isAbsoluteTypeinstallTo.isRelativeTyperelocatableversionincludeRootinstallFrom.pathidentifierinstallFrom.isRelativeType01xbmc-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/tools/PackageMaker/XBMC Package.pmdoc/02plugins-contents.xml b/tools/PackageMaker/XBMC Package.pmdoc/02plugins-contents.xml deleted file mode 100644 index f57c1f9cc76b4..0000000000000 --- a/tools/PackageMaker/XBMC Package.pmdoc/02plugins-contents.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tools/PackageMaker/XBMC Package.pmdoc/02plugins.xml b/tools/PackageMaker/XBMC Package.pmdoc/02plugins.xml deleted file mode 100644 index 8c659e5783286..0000000000000 --- a/tools/PackageMaker/XBMC Package.pmdoc/02plugins.xml +++ /dev/null @@ -1 +0,0 @@ -org.xbmc.xbmcForMac.plugins.pkg1../../extras/user/pluginsparentscripts.postinstall.pathrequireAuthorizationscripts.postinstall.isRelativeTypescripts.postflight.pathinstallFrom.isRelativeTypeinstallTo.pathscripts.postflight.isRelativeTypeinstallTopost_install_user.pl02plugins-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/tools/PackageMaker/XBMC Package.pmdoc/02user-contents.xml b/tools/PackageMaker/XBMC Package.pmdoc/02user-contents.xml deleted file mode 100644 index fa5e01b5f5d32..0000000000000 --- a/tools/PackageMaker/XBMC Package.pmdoc/02user-contents.xml +++ /dev/null @@ -1 +0,0 @@ -modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file diff --git a/tools/PackageMaker/XBMC Package.pmdoc/02user.xml b/tools/PackageMaker/XBMC Package.pmdoc/02user.xml deleted file mode 100644 index 21072839670ec..0000000000000 --- a/tools/PackageMaker/XBMC Package.pmdoc/02user.xml +++ /dev/null @@ -1 +0,0 @@ -org.xbmc.xbmcForMac.user.pkg1../../extras/user/scripts.postinstall.isRelativeTypeinstallTo.isAbsoluteTypeinstallTo.isRelativeTypeparentscripts.postinstall.pathrequireAuthorizationscripts.postflight.pathinstallFrom.isRelativeTypeinstallTo.pathscripts.postflight.isRelativeTypeinstallToinstallFrom.pathpost_install_user.pl02user-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/tools/PackageMaker/XBMC Package.pmdoc/index.xml b/tools/PackageMaker/XBMC Package.pmdoc/index.xml deleted file mode 100644 index bfa62d62b27bc..0000000000000 --- a/tools/PackageMaker/XBMC Package.pmdoc/index.xml +++ /dev/null @@ -1,659 +0,0 @@ -XBMC for Mac/Users/d4rk/Desktop/XBMC_for_Mac_b1_1.mpkgorg.xbmcAtlantis rev 15066 Beta 1setup window.png\ - Copyright (C) \ -\ - 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\ -\ -\ -Also add information on how to contact you by electronic and paper mail.\ -\ -If the program is interactive, make it output a short notice like this\ -when it starts in an interactive mode:\ -\ - Gnomovision version 69, Copyright (C) year name of author\ - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\ - This is free software, and you are welcome to redistribute it\ - under certain conditions; type `show c' for details.\ -\ -The hypothetical commands `show w' and `show c' should show the appropriate\ -parts of the General Public License. Of course, the commands you use may\ -be called something other than `show w' and `show c'; they could even be\ -mouse-clicks or menu items--whatever suits your program.\ -\ -You should also get your employer (if you work as a programmer) or your\ -school, if any, to sign a "copyright disclaimer" for the program, if\ -necessary. Here is a sample; alter the names:\ -\ - Yoyodyne, Inc., hereby disclaims all copyright interest in the program\ - `Gnomovision' (which makes passes at compilers) written by James Hacker.\ -\ - , 1 April 1989\ - Ty Coon, President of Vice\ -\ -This General Public License does not permit incorporating your program into\ -proprietary programs. If your program is a subroutine library, you may\ -consider it more useful to permit linking proprietary applications with the\ -library. If this is what you want to do, use the GNU Library General\ -Public License instead of this License.\ - -\fs26 \ -By proceeding to install XBMC you are agreeing to the above license. The XBMC code is copyrighted to Team XBMC. Team XBMC reserves the right to modify this license at any time without notice.}]]>setup window.png\ -\ -Chacun est autoris\'e9 \'e0 copier et distribuer des copies conformes de ce document de licence, mais toute modification en est proscrite.\ -\ -Pr\'e9ambule\ -\ -La Licence Publique G\'e9n\'e9rale GNU (\'93GNU General Public License\'94) est une licence libre, en \'93copyleft\'94, destin\'e9e aux \'9cuvres logicielles et d\'92autres types de travaux.\ -\ -Les licences de la plupart des \'9cuvres logicielles et autres travaux de pratique sont con\'e7ues pour \'f4ter votre libert\'e9 de partager et modifier ces travaux. En contraste, la Licence Publique G\'e9n\'e9rale GNU a pour but de garantir votre libert\'e9 de partager et changer toutes les versions d\'92un programme \'97 afin d\'92assurer qu\'92il restera libre pour tous les utilisateurs. Nous, la Free Software Foundation, utilisons la Licence Publique G\'e9n\'e9rale GNU pour la plupart de nos logiciels ; cela s\'92applique aussi \'e0 tout autre travail \'e9dit\'e9 de cette fa\'e7on par ses auteurs. Vous pouvez, vous aussi, l\'92appliquer \'e0 vos propres programmes.\ -\ -Quand nous parlons de logiciel libre (\'93free\'94), nous nous r\'e9f\'e9rons \'e0 la libert\'e9 (\'93freedom\'94), pas au prix. Nos Licences Publiques G\'e9n\'e9rales sont con\'e7ues pour assurer que vous ayez la libert\'e9 de distribuer des copies de logiciel libre (et le facturer si vous le souhaitez), que vous receviez le code source ou pouviez l\'92obtenir si vous le voulez, que vous pouviez modifier le logiciel ou en utiliser toute partie dans de nouveaux logiciels libres, et que vous sachiez que vous avez le droit de faire tout ceci.\ -\ -Pour prot\'e9ger vos droits, nous avons besoin d\'92emp\'eacher que d\'92autres vous restreignent ces droits ou vous demande de leur abandonner ces droits. En cons\'e9quence, vous avez certaines responsabilit\'e9s si vous distribuez des copies d\'92un tel programme ou si vous le modifiez : les responsabilit\'e9s de respecter la libert\'e9 des autres.\ -\ -Par exemple, si vous distribuez des copies d\'92un tel programme, que ce soit gratuit ou contre un paiement, vous devez accorder aux Destinataires les m\'eames libert\'e9s que vous avez re\'e7ues. Vous devez aussi vous assurer qu\'92eux aussi re\'e7oivent ou peuvent recevoir son code source. Et vous devez leur montrer les termes de cette licence afin qu\'92ils connaissent leurs droits.\ -\ -Les d\'e9veloppeurs qui utilisent la GPL GNU prot\'e8gent vos droits en deux \'e9tapes : (1) ils affirment leur droits d\'92auteur (\'93copyright\'94) sur le logiciel, et (2) vous accordent cette Licence qui vous donne la permission l\'e9gale de le copier, le distribuer et/ou le modifier.\ -\ -Pour la protection des d\'e9veloppeurs et auteurs, la GPL stipule clairement qu\'92il n\'92y a pas de garantie pour ce logiciel libre. Aux fins \'e0 la fois des utilisateurs et auteurs, la GPL requi\'e8re que les versions modifi\'e9es soient marqu\'e9es comme chang\'e9es, afin que leurs probl\'e8mes ne soient pas attribu\'e9s de fa\'e7on erron\'e9e aux auteurs des versions pr\'e9c\'e9dentes.\ -\ -Certains dispositifs sont con\'e7us pour emp\'eacher l\'92acc\'e8s des utilisateurs \'e0 l\'92installation ou l\'92ex\'e9cution de versions modifi\'e9es du logiciel \'e0 l\'92int\'e9rieur de ces dispositifs, alors que les fabricants le peuvent. Ceci est fondamentalement incompatible avec le but de prot\'e9ger la libert\'e9 des utilisateurs de modifier le logiciel. L\'92aspect syst\'e9matique de tels abus se produit dans le secteur des produits destin\'e9s aux utilisateurs individuels, ce qui est pr\'e9cid\'e9ment ce qui est le plus inacceptable. Aussi, nous avons con\'e7u cette version de la GPL pour prohiber cette pratique pour ces produits. Si de tels probl\'e8mes surviennent dans d\'92autres domaines, nous nous tenons pr\'eat \'e0 \'e9tendre cette restriction \'e0 ces domaines dans de futures versions de la GPL, autant qu\'92il sera n\'e9cessaire pour prot\'e9ger la libert\'e9 des utilisateurs.\ -\ -Finalement, chaque programme est constamment menac\'e9 par les brevets logiciels. Les \'c9tats ne devraient pas autoriser de tels brevets \'e0 restreindre le d\'e9veloppement et l\'92utilisation de logiciels libres sur des ordinateurs d\'92usage g\'e9n\'e9ral ; mais dans ceux qui le font, nous voulons sp\'e9cialement \'e9viter le danger que les brevets appliqu\'e9s \'e0 un programme libre puisse le rendre effectivement propri\'e9taire. Pour emp\'eacher ceci, la GPL assure que les brevets ne peuvent \'eatre utilis\'e9s pour rendre le programme non-libre.\ -\ -Les termes pr\'e9cis et conditions concernant la copie, la distribution et la modification suivent.\ -\ -\ -TERMES ET CONDITIONS\ -Article 0. D\'e9finitions.\ -\ -\'ab Cette Licence \'bb se r\'e9f\'e8re \'e0 la version 3 de la \'93GNU General Public License\'94 (le texte original en anglais).\ -\ -\'ab Droit d\'92Auteur \'bb signifie aussi les droits du \'93copyright\'94 ou voisins qui s\'92appliquent \'e0 d\'92autres types de travaux, tels que ceux sur les masques de semi-conducteurs.\ -\ -\'ab Le Programme \'bb se r\'e9f\'e8re \'e0 tout travail qui peut \'eatre sujet au Droit d\'92Auteur (\'93copyright\'94) et dont les droits d\'92utilisation sont conc\'e9d\'e9s en vertu de cette Licence. Chacun des Licenci\'e9s, \'e0 qui cette Licence est conc\'e9d\'e9e, est d\'e9sign\'e9 par \'ab vous. \'bb Les \'ab Licenci\'e9s \'bb et les \'ab Destinataires \'bb peuvent \'eatre des personnes physiques ou morales (individus ou organisations).\ -\ -\'ab Modifier \'bb un travail signifie en obtenir une copie et adapter tout ou partie du travail d\'92une fa\'e7on n\'e9cessitant une autorisation d\'92un titulaire de Droit d\'92Auteur, autre que celle permettant d\'92en produire une copie conforme. Le travail r\'e9sultant est appel\'e9 une \'ab version modifi\'e9e \'bb du pr\'e9c\'e9dent travail, ou un travail \'ab bas\'e9 sur \'bb le pr\'e9c\'e9dent travail.\ -\ -Un \'ab Travail Couvert \'bb signifie soit le Programme non modifi\'e9 soit un travail bas\'e9 sur le Programme.\ -\ -\'ab Propager \'bb un travail signifie faire quoi que ce soit avec lui qui, sans permission, vous rendrait directement ou indirectement responsable d\'92un d\'e9lit de contrefa\'e7on suivant les lois relatives au Droit d\'92Auteur, \'e0 l\'92exception de son ex\'e9cution sur un ordinateur ou de la modification d\'92une copie priv\'e9e. La propagation inclue la copie, la distribution (avec ou sans modification), la mise \'e0 disposition envers le public, et aussi d'autres activit\'e9s dans certains pays.\ -\ -\'ab Acheminer \'bb un travail signifie tout moyen de propagation de celui-ci qui permet \'e0 d\'92autres parties de r\'e9aliser ou recevoir des copies. La simple interaction d\'92un utilisateur \'e0 travers un r\'e9seau informatique, sans transfert effectif d\'92une copie, ne constitue pas un acheminement.\ -\ -Une interface utilisateur interactive affiche des \'ab Notices L\'e9gales Appropri\'e9es \'bb quand elle comprend un dispositif convenable, bien visible et \'e9vident qui (1) affiche une notice appropri\'e9e sur les droits d\'92auteur et (2) informe l\'92utilisateur qu\'92il n\'92y a pas de garantie pour le travail (sauf si des garanties ont \'e9t\'e9 fournies hors du cadre de cette Licence), que les licenci\'e9s peuvent acheminer le travail sous cette Licence, et comment voir une copie de cette Licence. Si l\'92interface pr\'e9sente une liste de commandes utilisateur ou d\'92options, tel qu\'92un menu, un \'e9l\'e9ment \'e9vident dans la liste pr\'e9sent\'e9e remplit ce crit\'e8re.\ -Article 1. Code source.\ -\ -Le \'ab code source \'bb d\'92un travail signifie la forme pr\'e9f\'e9r\'e9e du travail permettant ou facilitant les modifications de celui-ci. Le \'ab code objet \'bb d\'92un travail signifie toute forme du travail qui n\'92en est pas le code source.\ -\ -Une \'ab Interface Standard \'bb signifie une interface qui est soit celle d\'92une norme officielle d\'e9finie par un organisme de normalisation reconnu ou, dans le cas des interfaces sp\'e9cifi\'e9es pour un langage de programmation particulier, une interface largement utilis\'e9e parmi les d\'e9veloppeurs travaillant dans ce langage.\ -\ -Les \'ab Biblioth\'e8ques Syst\'e8me \'bb d\'92un travail ex\'e9cutable incluent tout ce qui, en dehors du travail dans son ensemble, (a) est inclus dans la forme usuelle de paquetage d\'92un Composant Majeur mais ne fait pas partie de ce Composant Majeur et (b) sert seulement \'e0 permettre l\'92utilisation du travail avec ce Composant Majeur ou \'e0 impl\'e9menter une Interface Standard pour laquelle une impl\'e9mentation est disponible au public sous forme de code source ; un \'ab Composant Majeur \'bb signifie, dans ce contexte, un composant majeur essentiel (noyau, syst\'e8me de fen\'eatrage, etc.) du syst\'e8me d\'92exploitation (le cas \'e9ch\'e9ant) d\'92un syst\'e8me sur lequel le travail ex\'e9cutable fonctionne, ou bien un compilateur utilis\'e9 pour produire le code objet du travail, ou un interpr\'e8te de code objet utilis\'e9 pour ex\'e9cuter celui-ci.\ -\ -Le \'ab Source Correspondant \'bb d\'92un travail sous forme de code objet signifie l\'92ensemble des codes sources n\'e9cessaires pour g\'e9n\'e9rer, installer et (dans le cas d\'92un travail ex\'e9cutable) ex\'e9cuter le code objet et modifier le travail, y compris les scripts pour contr\'f4ler ces activit\'e9s. Cependant, cela n\'92inclue pas les Biblioth\'e8ques Syst\'e8me du travail, ni les outils d\'92usage g\'e9n\'e9ral ou les programmes libres g\'e9n\'e9ralement disponibles qui peuvent \'eatre utilis\'e9s sans modification pour achever ces activit\'e9s mais ne sont pas partie de ce travail. Par exemple le Source Correspondant inclut les fichiers de d\'e9finition d\'92interfaces associ\'e9s aux fichiers sources du travail, et le code source des biblioth\'e8ques partag\'e9es et des sous-routines li\'e9es dynamiquement, pour lesquelles le travail est sp\'e9cifiquement con\'e7u pour les requ\'e9rir via, par exemple, des communications de donn\'e9es ou contr\'f4les de flux internes entre ces sous-programmes et d\'92autres parties du travail.\ -\ -Le Source Correspondant n\'92a pas besoin d\'92inclure tout ce que les utilisateurs peuvent reg\'e9n\'e9rer automatiquement \'e0 partir d\'92autres parties du Source Correspondant.\ -\ -Le Source Correspondant pour un travail sous forme de code source est ce m\'eame travail.\ -Article 2. Permissions de base.\ -\ -Tous les droits accord\'e9s suivant cette Licence le sont jusqu\'92au terme des Droits d\'92Auteur (\'93copyright\'94) sur le Programme, et sont irr\'e9vocables pourvu que les conditions \'e9tablies soient remplies. Cette Licence affirme explicitement votre permission illimit\'e9e d\'92ex\'e9cuter le Programme non modifi\'e9. La sortie produite par l\'92ex\'e9cution d\'92un Travail Couvert n\'92est couverte par cette Licence que si cette sortie, \'e9tant donn\'e9 leur contenu, constitue un Travail Couvert. Cette Licence reconnait vos propres droits d\'92usage raisonnable (\'93fair use\'94 en l\'e9gislation des \'c9tats-Unis d\'92Am\'e9rique) ou autres \'e9quivalents, tels qu\'92ils sont pourvus par la loi applicable sur le Droit d\'92Auteur (\'93copyright\'94).\ -\ -Vous pouvez cr\'e9er, ex\'e9cuter et propager sans condition des Travaux Couverts que vous n\'92acheminez pas, aussi longtemps que votre licence demeure en vigueur. Vous pouvez acheminer des Travaux Couverts \'e0 d\'92autres personnes dans le seul but de leur faire r\'e9aliser des modifications \'e0 votre usage exclusif, ou pour qu\'92ils vous fournissent des facilit\'e9s vous permettant d\'92ex\'e9cuter ces travaux, pourvu que vous vous conformiez aux termes de cette Licence lors de l\'92acheminement de tout mat\'e9riel dont vous ne contr\'f4lez pas le Droit d\'92Auteur (\'93copyright\'94). Ceux qui, d\'e8s lors, r\'e9alisent ou ex\'e9cutent pour vous les Travaux Couverts ne doivent alors le faire qu\'92exclusivement pour votre propre compte, sous votre direction et votre contr\'f4le, suivant des termes qui leur interdisent de r\'e9aliser, en dehors de leurs relations avec vous, toute copie de votre mat\'e9riel soumis au Droit d\'92Auteur.\ -\ -L\'92acheminement dans toutes les autres circonstances n\'92est permis que selon les conditions \'e9tablies ci-dessous. La concession de sous-licences n\'92est pas autoris\'e9 ; l\'92article 10 rend cet usage non n\'e9cessaire.\ -Article 3. Protection des droits l\'e9gaux des utilisateurs envers les lois anti-contournement.\ -\ -Aucun Travail Couvert ne doit \'eatre vu comme faisant partie d\'92une mesure technologique effective selon toute loi applicable remplissant les obligations pr\'e9vues \'e0 l\'92article 11 du trait\'e9 international sur le droit d\'92auteur adopt\'e9 \'e0 l\'92OMPI le 20 d\'e9cembre 1996, ou toutes lois similaires qui prohibent ou restreignent le contournement de telles mesures.\ -\ -Si vous acheminez un Travail Couvert, vous renoncez \'e0 tout pouvoir l\'e9gal d\'92interdire le contournement des mesures technologiques dans tous les cas o\'f9 un tel contournement serait effectu\'e9 en exer\'e7ant les droits pr\'e9vus dans cette Licence pour ce Travail Couvert, et vous d\'e9clarez rejeter toute intention de limiter l\'92op\'e9ration ou la modification du Travail, en tant que moyens de renforcer, \'e0 l\'92encontre des utilisateurs de ce Travail, vos droits l\'e9gaux ou ceux de tierces parties d\'92interdire le contournement des mesures technologiques.\ -Article 4. Acheminement des copies conformes.\ -\ -Vous pouvez acheminer des copies conformes du code source du Programme tel que vous l\'92avez re\'e7u, sur n\'92importe quel support, pourvu que vous publiiez scrupuleusement et de fa\'e7on appropri\'e9e sur chaque copie une notice de Droit d\'92Auteur appropri\'e9e ; gardez intactes toutes les notices \'e9tablissant que cette Licence et tous les termes additionnels non permissifs ajout\'e9s en accord avec l\'92article 7 s\'92appliquent \'e0 ce code ; et donnez \'e0 chacun des Destinataires une copie de cette Licence en m\'eame temps que le Programme.\ -\ -Vous pouvez facturer un prix quelconque, y compris gratuit, pour chacune des copies que vous acheminez, et vous pouvez offrir une protection additionnelle de support ou de garantie en \'e9change d\'92un paiement.\ -Article 5. Acheminement des versions sources modifi\'e9es.\ -\ -Vous pouvez acheminer un travail bas\'e9 sur le Programme, ou bien les modifications pour le produire \'e0 partir du Programme, sous la forme de code source suivant les termes de l\'92article 4, pourvu que vous satisfassiez aussi \'e0 chacune des conditions requises suivantes :\ -\ - * a) Le travail doit comporter des notices \'e9videntes \'e9tablissant que vous l\'92avez modifi\'e9 et donnant la date correspondante.\ - * b) Le travail doit comporter des notices \'e9videntes \'e9tablissant qu\'92il est \'e9dit\'e9 selon cette Licence et les conditions ajout\'e9es d\'92apr\'e8s l\'92article 7. Cette obligation vient modifier l\'92obligation de l\'92article 4 de \'ab garder intactes toutes les notices. \'bb\ - * c) Vous devez licencier le travail entier, comme un tout, suivant cette Licence \'e0 quiconque entre en possession d\'92une copie. Cette Licence s\'92appliquera en cons\'e9quence, avec les termes additionnels applicables pr\'e9vus par l\'92article 7, \'e0 la totalit\'e9 du travail et chacune de ses parties, ind\'e9pendamment de la fa\'e7on dont ils sont empaquet\'e9s. Cette licence ne donne aucune permission de licencier le travail d\'92une autre fa\'e7on, mais elle n\'92invalide pas une telle permission si vous l\'92avez re\'e7ue s\'e9par\'e9ment.\ - * d) Si le travail a des interfaces utilisateurs interactives, chacune doit afficher les Notices L\'e9gales Appropri\'e9es ; cependant si le Programme a des interfaces qui n\'92affichent pas les Notices L\'e9gales Appropri\'e9es, votre travail n\'92a pas \'e0 les modifier pour qu\'92elles les affichent.\ -\ -Une compilation d\'92un Travail Couvert avec d\'92autres travaux s\'e9par\'e9s et ind\'e9pendants, qui ne sont pas par leur nature des extensions du Travail Couvert, et qui ne sont pas combin\'e9s avec lui de fa\'e7on \'e0 former un programme plus large, dans ou sur un volume de stockage ou un support de distribution, est appel\'e9 un \'ab aggr\'e9gat \'bb si la compilation et son Droit d\'92Auteur r\'e9sultant ne sont pas utilis\'e9s pour limiter l\'92acc\'e8s ou les droits l\'e9gaux des utilisateurs de la compilation en de\'e7a de ce que permettent les travaux individuels. L\'92inclusion d\'92un Travail Couvert dans un aggr\'e9gat ne cause pas l\'92application de cette Licence aux autres parties de l\'92aggr\'e9gat.\ -Article 6. Acheminement des formes non sources.\ -\ -Vous pouvez acheminer sous forme de code objet un Travail Couvert suivant les termes des articles 4 et 5, pourvu que vous acheminiez \'e9galement suivant les termes de cette Licence le Source Correspondant lisible par une machine, d\'92une des fa\'e7ons suivantes :\ -\ - * a) Acheminer le code objet sur, ou inclus dans, un produit physique (y compris un support de distribution physique), accompagn\'e9 par le Source Correspondant fix\'e9 sur un support physique durable habituellement utilis\'e9 pour les \'e9changes de logiciels.\ - * b) Acheminer le code objet sur, ou inclus dans, un produit physique (y compris un support de distribution physique), accompagn\'e9 d\'92une offre \'e9crite, valide pour au moins trois ann\'e9es et valide pour aussi longtemps que vous fournissez des pi\'e8ces de rechange ou un support client pour ce mod\'e8le de produit, afin de donner \'e0 quiconque poss\'e8de le code objet soit (1) une copie du Source Correspondant \'e0 tout logiciel dans ce produit qui est couvert par cette Licence, sur un support physique durable habituellement utilis\'e9 pour les \'e9changes de logiciels, pour un prix non sup\'e9rieur au co\'fbt raisonnable de la r\'e9alisation physique de l\'92acheminement de la source, ou soit (2) un acc\'e8s permettant de copier le Source Correspondant depuis un serveur r\'e9seau sans frais.\ - * c) Acheminer des copies individuelles du code objet avec une copie de l\'92offre \'e9crite de fournir le Source Correspondant. Cette alternative est permise seulement occasionellement et non-commercialement, et seulement si vous avez re\'e7u le code objet avec une telle offre, en accord avec l\'92article 6 alin\'e9a b.\ - * d) Acheminer le code objet en offrant un acc\'e8s depuis un emplacement d\'e9sign\'e9 (gratuit ou contre facturation) et offrir un acc\'e8s \'e9quivalent au Source Correspondant de la m\'eame fa\'e7on via le m\'eame emplacement et sans facturation suppl\'e9mentaire. Vous n\'92avez pas besoin d\'92obliger les Destinataires \'e0 copier le Source Correspondant en m\'eame temps que le code objet. Si l\'92emplacement pour copier le code objet est un serveur r\'e9seau, le Source Correspondant peut \'eatre sur un serveur diff\'e9rent (op\'e9r\'e9 par vous ou par un tiers) qui supporte des facilit\'e9s \'e9quivalentes de copie, pourvu que vous mainteniez des directions claires \'e0 proximit\'e9 du code objet indiquant o\'f9 trouver le Source Correspondant. Ind\'e9pendamment de quel serveur h\'e9berge le Source Correspondant, vous restez oblig\'e9 de vous assurer qu\'92il reste disponible aussi longtemps que n\'e9cessaire pour satisfaire \'e0 ces obligations.\ - * e) Acheminer le code objet en utilisant une transmission d\'92\'e9gal-\'e0-\'e9gal, pourvu que vous informiez les autres participants sur o\'f9 le code objet et le Source Correspondant du travail sont offerts sans frais au public g\'e9n\'e9ral suivant l\'92article 6 alin\'e9a d.\ -\ -Une portion s\'e9parable du code objet, dont le code source est exclu du Source Correspondant en tant que Biblioth\'e8que Syst\'e8me, n\'92a pas besoin d\'92\'eatre inclu dans l\'92acheminement du travail sous forme de code objet.\ -\ -Un \'ab Produit Utilisateur \'bb est soit (1) un \'ab Produit de Consommation, \'bb ce qui signifie toute propri\'e9t\'e9 personnelle tangible normalement utilis\'e9e \'e0 des fins personnelles, familiales ou relatives au foyer, soit (2) toute chose con\'e7ue ou vendue pour l\'92incorporation dans un lieu d\'92habitation. Pour d\'e9terminer si un produit constitue un Produit de Consommation, les cas ambigus sont r\'e9solus en fonction de la couverture. Pour un produit particulier re\'e7u par un utilisateur particulier, l\'92expression \'ab normalement utilis\'e9e \'bb ci-avant se r\'e9f\'e8re \'e0 une utilisation typique ou l\'92usage commun de produits de m\'eame cat\'e9gorie, ind\'e9pendamment du statut de cet utilisateur particulier ou de la fa\'e7on sp\'e9cifique dont cet utilisateur particulier utilise effectivement ou s\'92attend lui-m\'eame ou est attendu \'e0 utiliser ce produit. Un produit est un Produit de Consommation ind\'e9pendamment du fait que ce produit a ou n\'92a pas d\'92utilisations substantielles commerciales, industrielles ou hors Consommation, \'e0 moins que de telles utilisations repr\'e9sentent le seul mode significatif d\'92utilisation du produit.\ -\ -Les \'ab Informations d\'92Installation \'bb d\'92un Produit Utilisateur signifient toutes les m\'e9thodes, proc\'e9dures, cl\'e9s d\'92autorisation ou autres informations requises pour installer et ex\'e9cuter des versions modifi\'e9es d\'92un Travail Couvert dans ce Produit Utilisateur \'e0 partir d\'92une version modifi\'e9e de son Source Correspondant. Les informations qui suffisent \'e0 assurer la continuit\'e9 de fonctionnement du code objet modifi\'e9 ne doivent en aucun cas \'eatre emp\'each\'e9es ou interf\'e9r\'e9es du seul fait qu\'92une modification a \'e9t\'e9 effectu\'e9e.\ -\ -Si vous acheminez le code objet d\'92un Travail Couvert dans, ou avec, ou sp\'e9cifiquement pour l\'92utilisation dans, un Produit Utilisateur et l\'92acheminement se produit en tant qu\'92\'e9l\'e9ment d\'92une transaction dans laquelle le droit de possession et d\'92utilisation du Produit Utilisateur est transf\'e9r\'e9 au Destinataire d\'e9finitivement ou pour un terme fix\'e9 (ind\'e9pendamment de la fa\'e7on dont la transaction est caract\'e9ris\'e9e), le Source Correspondant achemin\'e9 selon cet article-ci doit \'eatre accompagn\'e9 des Informations d\'92Installation. Mais cette obligation ne s\'92applique pas si ni vous ni aucune tierce partie ne d\'e9tient la possibilit\'e9 d\'92intaller un code objet modifi\'e9 sur le Produit Utilisateur (par exemple, le travail a \'e9t\'e9 install\'e9 en m\'e9moire morte).\ -\ -L\'92obligation de fournir les Informations d\'92Installation n\'92inclue pas celle de continuer \'e0 fournir un service de support, une garantie ou des mises \'e0 jour pour un travail qui a \'e9t\'e9 modifi\'e9 ou install\'e9 par le Destinataire, ou pour le Produit Utilisateur dans lequel il a \'e9t\'e9 modifi\'e9 ou install\'e9. L\'92acc\'e8s \'e0 un r\'e9seau peut \'eatre rejet\'e9 quand la modification elle-m\'eame affecte mat\'e9riellement et d\'e9favorablement les op\'e9rations du r\'e9seau ou viole les r\'e8gles et protocoles de communication au travers du r\'e9seau.\ -\ -Le Source Correspondant achemin\'e9 et les Informations d\'92Installation fournies, en accord avec cet article, doivent \'eatre dans un format publiquement document\'e9 (et dont une impl\'e9mentation est disponible aupr\'e8s du public sous forme de code source) et ne doit n\'e9cessiter aucune cl\'e9 ou mot de passe sp\'e9cial pour le d\'e9paquetage, la lecture ou la copie.\ -Article 7. Termes additionnels.\ -\ -Les \'ab permissions additionelles \'bb d\'e9signent les termes qui suppl\'e9mentent ceux de cette Licence en \'e9mettant des exceptions \'e0 l\'92une ou plusieurs de ses conditions. Les permissions additionnelles qui sont applicables au Programme entier doivent \'eatre trait\'e9es comme si elles \'e9taient incluent dans cette Licence, dans les limites de leur validit\'e9 suivant la loi applicable. Si des permissions additionnelles s\'92appliquent seulement \'e0 une partie du Programme, cette partie peut \'eatre utilis\'e9e s\'e9par\'e9ment suivant ces permissions, mais le Programme tout entier reste gouvern\'e9 par cette Licence sans regard aux permissions additionelles.\ -\ -Quand vous acheminez une copie d\'92un Travail Couvert, vous pouvez \'e0 votre convenance \'f4ter toute permission additionelle de cette copie, ou de n\'92importe quelle partie de celui-ci. (Des permissions additionnelles peuvent \'eatre r\'e9dig\'e9es de fa\'e7on \'e0 requ\'e9rir leur propre suppression dans certains cas o\'f9 vous modifiez le travail.) Vous pouvez placer les permissions additionnelles sur le mat\'e9riel achemin\'e9, ajout\'e9es par vous \'e0 un Travail Couvert pour lequel vous avez ou pouvez donner les permissions de Droit d\'92Auteur (\'93copyright\'94) appropri\'e9es.\ -\ -Nonobstant toute autre clause de cette Licence, pour tout constituant que vous ajoutez \'e0 un Travail Couvert, vous pouvez (si autoris\'e9 par les titulaires de Droit d\'92Auteur pour ce constituant) suppl\'e9menter les termes de cette Licence avec des termes :\ -\ - * a) qui rejettent la garantie ou limitent la responsabilit\'e9 de fa\'e7on diff\'e9rente des termes des articles 15 et 16 de cette Licence ; ou\ - * b) qui requi\'e8rent la pr\'e9servation de notices l\'e9gales raisonnables sp\'e9cifi\'e9es ou les attributions d\'92auteur dans ce constituant ou dans les Notices L\'e9gales Appropri\'e9es affich\'e9es par les travaux qui le contiennent ; ou\ - * c) qui prohibent la repr\'e9sentation incorrecte de l\'92origine de ce constituant, ou qui requi\'e8rent que les versions modifi\'e9es d\'92un tel constituant soit marqu\'e9es par des moyens raisonnables comme diff\'e9rentes de la version originale ; ou\ - * d) qui limitent l\'92usage \'e0 but publicitaire des noms des conc\'e9dants de licence et des auteurs du constituant ; ou\ - * e) qui refusent \'e0 accorder des droits selon la l\'e9gislation relative aux marques commerciales, pour l\'92utilisation dans des noms commerciaux, marques commerciales ou marques de services ; ou\ - * f) qui requi\'e8rent l\'92indemnisation des conc\'e9dants de licences et auteurs du constituant par quiconque achemine ce constituant (ou des versions modifi\'e9es de celui-ci) en assumant contractuellement la responsabilit\'e9 envers le Destinataire, pour toute responsabilit\'e9 que ces engagements contractuels imposent directement \'e0 ces octroyants de licences et auteurs.\ -\ -Tous les autres termes additionnels non permissifs sont consid\'e9r\'e9s comme des \'ab restrictions avanc\'e9es \'bb dans le sens de l\'92article 10. Si le Programme tel que vous l\'92avez re\'e7u, ou toute partie de celui-ci, contient une notice \'e9tablissant qu\'92il est gouvern\'e9 par cette Licence en m\'eame temps qu\'92un terme qui est une restriction avanc\'e9e, vous pouvez \'f4ter ce terme. Si un document de licence contient une restriction avanc\'e9e mais permet la reconcession de licence ou l\'92acheminement suivant cette Licence, vous pouvez ajouter un Travail Couvert constituant gouvern\'e9 par les termes de ce document de licence, pourvu que la restriction avanc\'e9e ne survit pas \'e0 un telle cession de licence ou acheminement.\ -\ -Si vous ajoutez des termes \'e0 un Travail Couvert en accord avec cet article, vous devez placer, dans les fichiers sources appropri\'e9s, une d\'e9claration des termes additionnels qui s\'92appliquent \'e0 ces fichiers, ou une notice indiquant o\'f9 trouver les termes applicables.\ -\ -Les termes additionnels, qu\'92ils soient permissifs ou non permissifs, peuvent \'eatre \'e9tablis sous la forme d\'92une licence \'e9crite s\'e9par\'e9ment, ou \'e9tablis comme des exceptions ; les obligations ci-dessus s\'92appliquent dans chacun de ces cas.\ -Article 8. Terminaison.\ -\ -Vous ne pouvez ni propager ni modifier un Travail Couvert autrement que suivant les termes de cette Licence. Toute autre tentative de le propager ou le modifier est nulle et terminera automatiquement vos droits selon cette Licence (y compris toute licence de brevet accord\'e9e selon le troisi\'e8me paragraphe de l\'92article 11).\ -\ -Cependant, si vous cessez toute violation de cette Licence, alors votre licence depuis un titulaire de Droit d\'92Auteur (\'93copyright\'94) est r\'e9instaur\'e9e (a) \'e0 titre provisoire \'e0 moins que et jusqu\'92\'e0 ce que le titulaire de Droit d\'92Auteur termine finalement et explicitement votre licence, et (b) de fa\'e7on permanente si le titulaire de Droit d\'92Auteur ne parvient pas \'e0 vous notifier de la violation par quelque moyen raisonnable dans les soixante (60) jours apr\'e8s la cessation.\ -\ -De plus, votre licence depuis un titulaire particulier de Droit d\'92Auteur est r\'e9instaur\'e9e de fa\'e7on permanente si ce titulaire vous notifie de la violation par quelque moyen raisonnable, c\'92est la premi\'e8re fois que vous avez re\'e7u une notification deviolation de cette Licence (pour un travail quelconque) depuis ce titulaire de Droit d\'92Auteur, et vous r\'e9solvez la violation dans les trente (30) jours qui suivent votre r\'e9ception de la notification.\ -\ -La terminaison de vos droits suivant cette section ne terminera pas les licences des parties qui ont re\'e7u des copies ou droits de votre part suivant cette Licence. Si vos droits ont \'e9t\'e9 termin\'e9s et non r\'e9instaur\'e9s de fa\'e7on permanente, vous n\'92\'eates plus qualifi\'e9 \'e0 recevoir de nouvelles licences pour les m\'eames constituants selon l\'92article 10.\ -Article 9. Acceptation non requise pour obtenir des copies.\ -\ -Vous n\'92\'eates pas oblig\'e9 d\'92accepter cette licence afin de recevoir ou ex\'e9cuter une copie du Programme. La propagation asservie d\'92un Travail Couvert qui se produit simplement en cons\'e9quence d\'92une transmission d\'92\'e9gal-\'e0-\'e9gal pour recevoir une copie ne n\'e9cessite pas l\'92acceptation. Cependant, rien d\'92autre que cette Licence ne vous accorde la permission de propager ou modifier un quelconque Travail Couvert. Ces actions enfreignent le Droit d\'92Auteur si vous n\'92acceptez pas cette Licence. Par cons\'e9quent, en modifiant ou propageant un Travail Couvert, vous indiquez votre acceptation de cette Licence pour agir ainsi.\ -Article 10. Cession automatique de Licence aux Destinataires et interm\'e9diaires.\ -\ -Chaque fois que vous acheminez un Travail Couvert, le Destinataire re\'e7oit automatiquement une licence depuis les conc\'e9dants originaux, pour ex\'e9cuter, modifier et propager ce travail, suivant les termes de cette Licence. Vous n\'92\'eates pas responsable du renforcement de la conformation des tierces parties avec cette Licence.\ -\ -Une \'ab transaction d\'92entit\'e9 \'bb d\'e9signe une transaction qui transf\'e8re le contr\'f4le d\'92une organisation, ou de substantiellement tous ses actifs, ou la subdivision d\'92une organisation, ou la fusion de plusieurs organisations. Si la propagation d\'92un Travail Couvert r\'e9sulte d\'92une transaction d\'92entit\'e9, chaque partie \'e0 cette transaction qui re\'e7oit une copie du travail re\'e7oit aussi les licences pour le travail que le pr\'e9d\'e9cesseur int\'e9ress\'e9 \'e0 cette partie avait ou pourrait donner selon le paragraphe pr\'e9c\'e9dent, plus un droit de possession du Source Correspondant de ce travail depuis le pr\'e9d\'e9cesseur int\'e9ress\'e9 si ce pr\'e9d\'e9cesseur en dispose ou peut l\'92obtenir par des efforts raisonnables.\ -\ -Vous ne pouvez imposer aucune restriction avanc\'e9e dans l\'92exercice des droits accord\'e9s ou affirm\'e9s selon cette Licence. Par exemple, vous ne pouvez imposer aucun paiement pour la licence, aucune royaltie, ni aucune autre charge pour l\'92exercice des droits accord\'e9s selon cette Licence ; et vous ne pouvez amorcer aucun litige judiciaire (y compris une r\'e9clamation crois\'e9e ou contre-r\'e9clamation dans un proc\'e8s) sur l\'92all\'e9gation qu\'92une revendication de brevet est enfreinte par la r\'e9alisation, l\'92utilisation, la vente, l\'92offre de vente, ou l\'92importation du Programme ou d\'92une quelconque portion de celui-ci.\ -Article 11. Brevets.\ -\ -Un \'ab contributeur \'bb est un titulaire de Droit d\'92Auteur (\'93copyright\'94) qui autorise l\'92utilisation selon cette Licence du Programme ou du travail sur lequel le Programme est bas\'e9. Le travail ainsi soumis \'e0 licence est appel\'e9 la \'ab version contributive \'bb de ce contributeur.\ -\ -Les \'ab revendications de brevet essentielles \'bb sont toutes les revendications de brevets d\'e9tenues ou contr\'f4l\'e9es par le contributeur, qu\'92elles soient d\'e9j\'e0 acquises par lui ou acquises subs\'e9quemment, qui pourraient \'eatre enfreintes de quelque mani\'e8re, permises par cette Licence, sur la r\'e9alisation, l\'92utilisation ou la vente de la version contributive de celui-ci. Aux fins de cette d\'e9finition, le \'ab contr\'f4le \'bb inclue le droit de conc\'e9der des sous-licences de brevets d\'92une mani\'e8re consistante, n\'e9cessaire et suffisante, avec les obligations de cette Licence.\ -\ -Chaque contributeur vous accorde une licence de brevet non exclusive, mondiale et libre de toute royaltie, selon les revendications de brevet essentielles, pour r\'e9aliser, utiliser, vendre, offrir \'e0 la vente, importer et autrement ex\'e9cuter, modifier et propager les contenus de sa version contributive.\ -\ -Dans les trois paragraphes suivants, une \'ab licence de brevet \'bb d\'e9signe tous les accords ou engagements exprim\'e9s, quel que soit le nom que vous lui donnez, de ne pas mettre en vigueur un brevet (telle qu\'92une permission explicite pour mettre en pratique un brevet, ou un accord pour ne pas poursuivre un Destinataire pour cause de violation de brevet). \'ab Accorder \'bb une telle licence de brevet \'e0 une partie signifie conclure un tel accord ou engagement \'e0 ne pas faire appliquer le brevet \'e0 cette partie.\ -\ -Si vous acheminez un Travail Couvert, d\'e9pendant en connaissance d\'92une licence de brevet, et si le Source Correspondant du travail n\'92est pas disponible \'e0 quiconque copie, sans frais et suivant les termes de cette Licence, \'e0 travers un serveur r\'e9seau publiquement acessible ou tout autre moyen imm\'e9diatement accessible, alors vous devez soit (1) rendre la Source Correspondante ainsi disponible, soit (2) vous engager \'e0 vous priver pour vous-m\'eame du b\'e9n\'e9fice de la licence de brevet pour ce travail particulier, soit (3) vous engager, d\'92une fa\'e7on consistante avec les obligations de cette Licence, \'e0 \'e9tendre la licence de brevet aux Destinataires de ce travail. \'ab D\'e9pendant en connaissance \'bb signifie que vous avez effectivement connaissance que, selon la licence de brevet, votre acheminement du Travail Couvert dans un pays, ou l\'92utilisation du Travail Couvert par votre Destinataire dans un pays, infreindrait un ou plusieurs brevets identifiables dans ce pays o\'f9 vous avez des raisons de penser qu\'92ils sont valides.\ -\ -Si, conform\'e9ment \'e0 ou en liaison avec une m\'eame transaction ou un m\'eame arrangement, vous acheminez, ou propagez en procurant un acheminement de, un Travail Couvert et accordez une licence de brevet \'e0 l\'92une des parties recevant le Travail Couvert pour lui permettre d\'92utiliser, propager, modifier ou acheminer une copie sp\'e9cifique du Travail Couvert, alors votre accord est automatiquement \'e9tendu \'e0 tous les Destinataires du Travail Couvert et des travaux bas\'e9s sur celui-ci.\ -\ -Une licence de brevet est \'ab discriminatoire \'bb si, dans le champ de sa couverture, elle n\'92inclut pas un ou plusieurs des droits qui sont sp\'e9cifiquement accord\'e9s selon cette Licence, ou en prohibe l\'92exercice, ou est conditionn\'e9e par le non-exercice d\'92un ou plusieurs de ces droits. Vous ne pouvez pas acheminer un Travail Couvert si vous \'eates partie \'e0 un arrangement selon lequel une partie tierce exer\'e7ant son activit\'e9 dans la distribution de logiciels et \'e0 laquelle vous effectuez un paiement fond\'e9 sur l\'92\'e9tendue de votre activit\'e9 d\'92acheminement du travail, et selon lequel la partie tierce accorde, \'e0 une quelconque partie qui recevrait depuis vous le Travail Couvert, une licence de brevet discriminatoire (a) en relation avec les copies du Travail Couvert achemin\'e9es par vous (ou les copies r\'e9alis\'e9es \'e0 partir de ces copies), ou (b) avant tout destin\'e9e et en relation avec des produits sp\'e9cifiques ou compilations contenant le Travail Couvert, \'e0 moins que vous ayez conclu cet arrangement ou que la licence de brevet ait \'e9t\'e9 accord\'e9e avant le 28 mars 2007.\ -\ -Rien dans cette Licence ne devrait \'eatre interpr\'e9t\'e9 comme devant exclure ou limiter toute licence implicite ou d\'92autres moyens de d\'e9fense \'e0 une infraction qui vous seraient autrement disponible selon la loi applicable relative aux brevets.\ -Article 12. Non abandon de la libert\'e9 des autres.\ -\ -Si des conditions vous sont impos\'e9es (que ce soit par d\'e9cision judiciaire, par un accord ou autrement) qui contredisent les conditions de cette Licence, elles ne vous excusent pas des conditions de cette Licence. Si vous ne pouvez pas acheminer un Travail Couvert de fa\'e7on \'e0 satisfaire simult\'e9n\'e9ment vos obligations suivant cette Licence et toutes autres obligations pertinentes, alors en cons\'e9quence vous ne pouvez pas du tout l\'92acheminer. Par exemple, si vous avez un accord sur des termes qui vous obligent \'e0 collecter pour le r\'e9acheminement des royalties depuis ceux \'e0 qui vous acheminez le Programme, la seule fa\'e7on qui puisse vous permettre de satisfaire \'e0 la fois \'e0 ces termes et ceux de cette Licence sera de vous abstenir enti\'e8rement d\'92acheminer le Programme.\ -Article 13. Utilisation avec la Licence G\'e9n\'e9rale Publique Affero GNU.\ -\ -Nonobstant toute autre clause de cette Licence, vous avez la permission de lier ou combiner tout Travail Couvert avec un travail plac\'e9 sous la version 3 de la Licence G\'e9n\'e9rale Publique GNU Affero (\'93GNU Affero General Public License\'94) en un seul travail combin\'e9, et d\'92acheminer le travail r\'e9sultant. Les termes de cette Licence continueront \'e0 s\'92appliquer \'e0 la partie formant un Travail Couvert, mais les obligations sp\'e9ciales de la Licence G\'e9n\'e9rale Publique GNU Affero, article 13, concernant l\'92interaction \'e0 travers un r\'e9seau s\'92appliqueront \'e0 la combinaison en tant que telle.\ -Article 14. Versions r\'e9vis\'e9es de cette License.\ -\ -La Free Software Foundation peut publier des versions r\'e9vis\'e9es et/ou nouvelles de la Licence Publique G\'e9n\'e9rale GNU (\'93GNU General Public License\'94) de temps en temps. De telles version nouvelles resteront similaires dans l\'92esprit avec la pr\'e9sente version, mais peuvent diff\'e9rer dans le d\'e9tail afin de traiter de nouveaux probl\'e8mes ou pr\'e9occupations.\ -\ -Chaque version re\'e7oit un num\'e9ro de version distinctif. Si le Programme indique qu\'92une version sp\'e9cifique de la Licence Publique G\'e9n\'e9rale GNU \'ab ou toute version ult\'e9rieure \'bb (\'93or any later version\'94) s\'92applique \'e0 celui-ci, vous avez le choix de suivre soit les termes et conditions de cette version num\'e9rot\'e9e, soit ceux de n\'92importe quelle version publi\'e9e ult\'e9rieurement par la Free Software Foundation. Si le Programme n\'92indique pas une version sp\'e9cifique de la Licence Publique G\'e9n\'e9rale GNU, vous pouvez choisir l\'92une quelconque des versions qui ont \'e9t\'e9 publi\'e9es par la Free Software Foundation.\ -\ -Si le Programme sp\'e9cifie qu\'92un interm\'e9diaire peut d\'e9cider quelles versions futures de la Licence G\'e9n\'e9rale Publique GNU peut \'eatre utilis\'e9e, la d\'e9claration publique d\'92acceptation d\'92une version par cet interm\'e9diaire vous autorise \'e0 choisir cette version pour le Programme.\ -\ -Des versions ult\'e9rieures de la licence peuvent vous donner des permissions additionelles ou diff\'e9rentes. Cependant aucune obligation additionelle n\'92est impos\'e9e \'e0 l\'92un des auteurs ou titulaires de Droit d\'92Auteur du fait de votre choix de suivre une version ult\'e9rieure.\ -Article 15. D\'e9claration d\'92absence de garantie.\ -\ -IL N\'92Y A AUCUNE GARANTIE POUR LE PROGRAMME, DANS LES LIMITES PERMISES PAR LA LOI APPLICABLE. \'c0 MOINS QUE CELA NE SOIT \'c9TABLI DIFF\'c9REMMENT PAR \'c9CRIT, LES PROPRI\'c9TAIRES DE DROITS ET/OU LES AUTRES PARTIES FOURNISSENT LE PROGRAMME \'ab EN L\'92\'c9TAT \'bb SANS GARANTIE D\'92AUCUNE SORTE, QU\'92ELLE SOIT EXPRIM\'c9E OU IMPLICITE, CECI COMPRENANT, SANS SE LIMITER \'c0 CELLES-CI, LES GARANTIES IMPLICITES DE COMMERCIALISABILIT\'c9 ET D\'92AD\'c9QUATION \'c0 UN OBJECTIF PARTICULIER. VOUS ASSUMEZ LE RISQUE ENTIER CONCERNANT LA QUALIT\'c9 ET LES PERFORMANCES DU PROGRAMME. DANS L\'92\'c9VENTUALIT\'c9 O\'d9 LE PROGRAMME S\'92AV\'c9RERAIT D\'c9FECTUEUX, VOUS ASSUMEZ LES CO\'dbTS DE TOUS LES SERVICES, R\'c9PARATIONS OU CORRECTIONS N\'c9CESSAIRES.\ -Article 16. Limitation de responsabilit\'e9.\ -\ -EN AUCUNE AUTRE CIRCONSTANCE QUE CELLES REQUISES PAR LA LOI APPLICABLE OU ACCORD\'c9ES PAR \'c9CRIT, UN TITULAIRE DE DROITS SUR LE PROGRAMME, OU TOUT AUTRE PARTIE QUI MODIFIE OU ACHEMINE LE PROGRAMME COMME PERMIS CI-DESSUS, NE PEUT \'caTRE TENU POUR RESPONSABLE ENVERS VOUS POUR LES DOMMAGES, INCLUANT TOUT DOMMAGE G\'c9N\'c9RAL, SP\'c9CIAL, ACCIDENTEL OU INDUIT SURVENANT PAR SUITE DE L\'92UTILISATION OU DE L\'92INCAPACIT\'c9 D\'92UTILISER LE PROGRAMME (Y COMPRIS, SANS SE LIMITER \'c0 CELLES-CI, LA PERTE DE DONN\'c9ES OU L\'92INEXACTITUDE DES DONN\'c9ES RETOURN\'c9ES OU LES PERTES SUBIES PAR VOUS OU DES PARTIES TIERCES OU L\'92INCAPACIT\'c9 DU PROGRAMME \'c0 FONCTIONNER AVEC TOUT AUTRE PROGRAMME), M\'caME SI UN TEL TITULAIRE OU TOUTE AUTRE PARTIE A \'c9T\'c9 AVIS\'c9 DE LA POSSIBILIT\'c9 DE TELS DOMMAGES.\ -Article 17. Interpr\'e9tation des sections 15 et 16.\ -\ -Si la d\'e9claration d\'92absence de garantie et la limitation de responsabilit\'e9 fournies ci-dessus ne peuvent prendre effet localement selon leurs termes, les cours de justice qui les examinent doivent appliquer la l\'e9gislation locale qui approche au plus pr\'e8s possible une lev\'e9e absolue de toute responsabilit\'e9 civile li\'e9e au Programme, \'e0 moins qu\'92une garantie ou assumation de responsabilit\'e9 accompagne une copie du Programme en \'e9change d\'92un paiement.\ -\ -FIN DES TERMES ET CONDITIONS.\ -Comment appliquer ces termes \'e0 vos nouveaux programmes\ -\ -Si vous d\'e9veloppez un nouveau programme et voulez qu\'92il soit le plus possible utilisable par le public, la meilleure fa\'e7on d\'92y parvenir et d\'92en faire un logiciel libre que chacun peut redistribuer et changer suivant ces termes-ci.\ -\ -Pour appliquer ces termes, attachez les notices suivantes au programme. Il est plus s\'fbr de les attacher au d\'e9but de chacun des fichiers sources afin de transporter de fa\'e7on la plus effective possible l\'92exclusion de garantie ; et chaque fichier devrait comporter au moins la ligne de r\'e9servation de droit (\'93copyright\'94) et une indication permettant de savoir o\'f9 la notice compl\'e8te peut \'eatre trouv\'e9e :\ -\ - \ - Copyright (C) \'97 Tous droits r\'e9serv\'e9s.\ - \ - Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le\ - modifier suivant les termes de la \'93GNU General Public License\'94 telle que\ - publi\'e9e par la Free Software Foundation : soit la version 3 de cette\ - licence, soit (\'e0 votre gr\'e9) toute version ult\'e9rieure.\ - \ - Ce programme est distribu\'e9 dans l\'92espoir qu\'92il vous sera utile, mais SANS\ - AUCUNE GARANTIE : sans m\'eame la garantie implicite de COMMERCIALISABILIT\'c9\ - ni d\'92AD\'c9QUATION \'c0 UN OBJECTIF PARTICULIER. Consultez la Licence G\'e9n\'e9rale\ - Publique GNU pour plus de d\'e9tails.\ - \ - Vous devriez avoir re\'e7u une copie de la Licence G\'e9n\'e9rale Publique GNU avec\ - ce programme ; si ce n\'92est pas le cas, consultez :\ - .\ -\ -Ajoutez \'e9galement les informations permettant de vous contacter par courrier \'e9lectronique ou postal.\ -\ -Si le programme produit une interaction sur un terminal, faites lui afficher une courte notice comme celle-ci lors de son d\'e9marrage en mode interactif :\ -\ - Copyright (C) \ - Ce programme vient SANS ABSOLUMENT AUCUNE GARANTIE ; taper \'93affiche g\'94 pour\ - les d\'e9tails. Ceci est un logiciel libre et vous \'eates invit\'e9 \'e0 le redistribuer\ - suivant certaines conditions ; taper \'93affiche c\'94 pour les d\'e9tails.\ -\ -Les commandes hypoth\'e9tiques \'93affiche g\'94 and \'93affiche c\'94 devrait afficher les parties appropri\'e9es de la Licence G\'e9n\'e9rale Publique. Bien s\'fbr, les commandes de votre programme peuvent \'eatre diff\'e9rentes ; pour une interface graphique, vous pourriez utiliser une \'ab bo\'eete \'c0 propos. \'bb\ -\ -Vous devriez \'e9galement obtenir de votre employeur (si vous travaillez en tant que programmeur) ou de votre \'e9cole un \'ab renoncement aux droits de propri\'e9t\'e9 \'bb pour ce programme, si n\'e9cessaire. Pour plus d\'92informations \'e0 ce sujet, et comment appliquer la GPL GNU, consultez .\ -\ -La Licence G\'e9n\'e9rale Publique GNU ne permet pas d\'92incorporer votre programme dans des programmes propri\'e9taires. Si votre programme est une biblioth\'e8que de sous-routines, vous pourriez consid\'e9rer qu\'92il serait plus utile de permettre de lier des applications propri\'e9taires avec la biblioth\'e8que. Si c\'92est ce que vous voulez faire, utilisez la Licence G\'e9n\'e9rale Publique Limit\'e9e GNU au lieu de cette Licence ; mais d\'92abord, veuillez lire .\ - -\fs26 \ -En proc\'e9dant \'e0 l'installation de XBMC, vous acceptez la licence ci-dessus. Les droits d'auteur reviennent \'e0 l'\'e9quipe XBMC. L'\'e9quipe XBMC se r\'e9serve le droit de modifier cette licence \'e0 tout moment sans pr\'e9avis.\ -}]]>01xbmc.xml02user.xmlproperties.userDomainproperties.systemDomainproperties.anywhereDomainproperties.customizeOptionproperties.titledescriptionpostinstallActions.actions diff --git a/tools/PackageMaker/post_install_user.pl b/tools/PackageMaker/post_install_user.pl deleted file mode 100755 index d25255323675a..0000000000000 --- a/tools/PackageMaker/post_install_user.pl +++ /dev/null @@ -1,192 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2008-2009 Team XBMC http://www.xbmc.org -# -# 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -############################################################################## -# Post install script -# -d4rk 09/13/08 -############################################################################## - -# use strict; # Apple TV's Perl doesn't support this -# use warnings; # - -my $installer_dir = "/var/tmp/installer.teamxbmc.xbmc"; - -# install any plugins that were copied -sub copy_plugins { - my $pluginsrc = "$installer_dir/plugins/"; - my $plugindst = get_home()."/Library/Application Support/XBMC/plugins/"; - - `mkdir -p "$plugindst"`; - `cp -r "$pluginsrc" "$plugindst"`; -} - -sub setup_sources { - my $xbmchome = get_xbmc_home(); - my $userdata = get_userdata_path(); - if (!$userdata) { - print STDERR "Unable to obtain userdata path\n"; - exit; - } - - my $sources = $userdata."/sources.xml"; - - # create userdata directory if it doesn't exist - `mkdir -p "$userdata"`; - - # check whether a sources.xml already exists, and if it does back it up - if ( -f $sources ) { - print STDERR "sources.xml found at \"$sources\", backing up\n"; - my $backup_sources = $sources.".".time().".xml"; - `cp -f \"$sources\" \"$backup_sources\"`; - } - - # construct a sources.xml string - my $sources_xml = get_sources_xml( get_default_sources() ); - if ( $sources_xml ) { - open SOURCES, ">$sources" || exit; - print SOURCES get_sources_xml( get_default_sources() ); - close SOURCES; - } -} - -sub get_userdata_path { - my $xhome = get_xbmc_home(); - return if !defined $xhome; - return "$xhome/userdata"; -} - -sub get_sources_xml { - my $sources = shift; - my ($sourcetype, $source); - - return if !defined $sources; - - my $xml = "\n"; - while ( ($sourcetype, $source) = each ( %$sources ) ) { - $xml .= (" " x 4)."<$sourcetype>\n"; - $xml .= (" " x 8)."\n"; - my ($name, $path); - while ( ($name, $path) = each( %{ $source } ) ) { - $xml .= (" " x 8)."\n"; - $xml .= (" " x 12)."$name\n"; - if ( $path =~ /(.*)\^\^(.*)/ ) { - $xml .= (" " x 12)."".$1."\n"; - $xml .= (" " x 12)."".$2."\n"; - } - else { - $xml .= (" " x 12)."".$path."\n"; - } - $xml .= (" " x 8)."\n"; - } - $xml .= (" " x 4)."\n"; - } - $xml .= "\n"; - return $xml; -} - -sub get_home { - return $ENV{'HOME'} if defined $ENV{'HOME'}; -} - -sub get_xbmc_home { - my $os = get_os(); - my $home = get_home(); - return if !defined $home; - if ( $os eq "osx" ) { - return $home."/Library/Application Support/XBMC"; - } - elsif ( $os eq "linux" ) { - return $home."/.xbmc"; - } - return; -} - -sub get_os { - if ( defined $ENV{'OSTYPE'} && $ENV{'OSTYPE'} =~ /linux/ ) { - return "linux"; - } - return "osx"; -} - -sub get_default_sources { - my $sources = {}; - my $home = get_home(); - my $xbmchome = get_xbmc_home(); - return if !defined $xbmchome; - - $sources->{'programs'} = {}; - $sources->{'video'} = {}; - $sources->{'music'} = {}; - $sources->{'pictures'} = {}; - $sources->{'files'} = {}; - - if ( get_os() eq "osx" ) { - - # Default sources for OS X - for my $key ( keys %$sources ) { - $sources->{$key}->{'Volumes'} = "/Volumes"; - $sources->{$key}->{'Home'} = "$home"; - $sources->{$key}->{'Desktop'} = "$home/Desktop"; - } - - $sources->{'music'}->{'Music'} = $home."/Music"; - $sources->{'music'}->{'Music Playlists'} = "special://musicplaylists"; - $sources->{'video'}->{'Movies'} = $home."/Movies"; - $sources->{'video'}->{'Video Playlists'} = "special://videoplaylists"; - $sources->{'pictures'}->{'Pictures'} = $home."/Pictures"; - - my $plugindir = "$xbmchome/plugins/"; - - # iPhoto - if ( -f "$plugindir/pictures/iPhoto/default.py" ) { - $sources->{'pictures'}->{'iPhoto'} = - "plugin://pictures/iPhoto/^^$plugindir/pictures/iPhoto/default.tbn"; - } - - # iTunes - if ( -f "$plugindir/music/iTunes/default.py" ) { - $sources->{'music'}->{'iTunes'} = - "plugin://music/iTunes/^^$plugindir/music/iTunes/default.tbn"; - } - - # AMT - if ( -f "$plugindir/video/Apple Movie Trailers II/default.py" ) { - $sources->{'video'}->{'Apple Movie Trailers'} = - "plugin://video/Apple Movie Trailers II/^^$plugindir/video/Apple Movie Trailers II/default.tbn"; - } - } - elsif ( get_os() eq "linux" ) { - - # Default source for Linux - for my $key ( keys %$sources ) { - $sources->{$key}->{'Media'} = "/media"; - $sources->{$key}->{'Home'} = "$home"; - $sources->{$key}->{'Desktop'} = "$home/Desktop"; - $sources->{$key}->{'Root'} = "/"; - } - } - return $sources; -} - -sub cleanup() { - `rm -rf "$installer_dir"`; -} - -copy_plugins(); -setup_sources(); -cleanup(); diff --git a/tools/PackageMaker/setup window.png b/tools/PackageMaker/setup window.png deleted file mode 100644 index 6214e4c267fb1..0000000000000 Binary files a/tools/PackageMaker/setup window.png and /dev/null differ diff --git a/tools/buildbot/osx-depends-check b/tools/buildbot/osx-depends-check deleted file mode 100755 index 526d6b3cc900c..0000000000000 --- a/tools/buildbot/osx-depends-check +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -git diff-tree --quiet -r HEAD@{1}..HEAD@{0} tools/osx/osx-depends/ -echo $? diff --git a/tools/darwin/depends/configure.in b/tools/darwin/depends/configure.in index aa8d489527d31..d755e00ce575b 100644 --- a/tools/darwin/depends/configure.in +++ b/tools/darwin/depends/configure.in @@ -46,9 +46,9 @@ case $use_darwin in use_sdk="${use_sdk:-$found_sdk}" # this is an issue. if we set prefix according to ${use_sdk}_${use_arch}, # then XBMC_DEPENDS prefix location in xcode must match but xcode uses its - # own defines for build. So just hardcode to 4.2_arm7 for now until we + # own defines for build. So just hardcode to 4.2_${use_arch} for now until we # can figure out a better way. - use_prefix=${use_staging}/${use_darwin}-4.2_arm7 + use_prefix=${use_staging}/${use_darwin}-4.2_${use_arch} if test "$use_arch" != "armv7"; then AC_MSG_ERROR(error in configure of --with-arch=$use_arch) fi diff --git a/tools/osx/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh similarity index 95% rename from tools/osx/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh rename to tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh index 45017d7abe1b7..82a618666810e 100755 --- a/tools/osx/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh +++ b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh @@ -1,6 +1,6 @@ #!/bin/sh # usage: ./mkdeb-xbmc-atv2.sh release/debug (case insensitive) -# Allows us to run mkdeb-xbmc-atv2.sh from anywhere in the three, rather than the tools/osx/packaging/xbmc-atv2 folder only +# Allows us to run mkdeb-xbmc-atv2.sh from anywhere in the three, rather than the tools/darwin/packaging/xbmc-atv2 folder only SWITCH=`echo $1 | tr [A-Z] [a-z]` DIRNAME=`dirname $0` @@ -23,9 +23,9 @@ fi if [ -f "/usr/bin/sudo" ]; then SUDO="/usr/bin/sudo" fi -if [ -f "/Users/Shared/xbmc-depends/ios-4.2_arm7/bin/dpkg-deb" ]; then +if [ -f "/Users/Shared/xbmc-depends/ios-4.2_armv7/bin/dpkg-deb" ]; then # make sure we pickup our tar, gnutar will fail when dpkg -i - bin_path=$(cd /Users/Shared/xbmc-depends/ios-4.2_arm7/bin; pwd) + bin_path=$(cd /Users/Shared/xbmc-depends/ios-4.2_armv7/bin; pwd) export PATH=${bin_path}:${PATH} fi diff --git a/tools/osx/packaging/xbmc-icon/mirrors.xbmc.org.png b/tools/darwin/packaging/xbmc-icon/mirrors.xbmc.org.png similarity index 100% rename from tools/osx/packaging/xbmc-icon/mirrors.xbmc.org.png rename to tools/darwin/packaging/xbmc-icon/mirrors.xbmc.org.png diff --git a/tools/osx/packaging/xbmc-icon/mkdeb-xbmc-iconpack.sh b/tools/darwin/packaging/xbmc-icon/mkdeb-xbmc-iconpack.sh similarity index 100% rename from tools/osx/packaging/xbmc-icon/mkdeb-xbmc-iconpack.sh rename to tools/darwin/packaging/xbmc-icon/mkdeb-xbmc-iconpack.sh diff --git a/tools/osx/packaging/xbmc-ios/mkdeb-xbmc-ios.sh b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh similarity index 94% rename from tools/osx/packaging/xbmc-ios/mkdeb-xbmc-ios.sh rename to tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh index 546e9efc2357b..4533a556db0c7 100755 --- a/tools/osx/packaging/xbmc-ios/mkdeb-xbmc-ios.sh +++ b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh @@ -1,7 +1,7 @@ #!/bin/sh # usage: ./mkdeb-xbmc-ios.sh release/debug (case insensitive) -# Allows us to run mkdeb-xbmc-ios.sh from anywhere in the three, rather than the tools/osx/packaging/xbmc-ios folder only +# Allows us to run mkdeb-xbmc-ios.sh from anywhere in the three, rather than the tools/darwin/packaging/xbmc-ios folder only SWITCH=`echo $1 | tr [A-Z] [a-z]` DIRNAME=`dirname $0` @@ -23,9 +23,9 @@ fi if [ -f "/usr/bin/sudo" ]; then SUDO="/usr/bin/sudo" fi -if [ -f "/Users/Shared/xbmc-depends/ios-4.2_arm7/bin/dpkg-deb" ]; then +if [ -f "/Users/Shared/xbmc-depends/ios-4.2_armv7/bin/dpkg-deb" ]; then # make sure we pickup our tar, gnutar will fail when dpkg -i - bin_path=$(cd /Users/Shared/xbmc-depends/ios-4.2_arm7/bin; pwd) + bin_path=$(cd /Users/Shared/xbmc-depends/ios-4.2_armv7/bin; pwd) export PATH=${bin_path}:${PATH} fi diff --git a/tools/PackageMaker/Makefile b/tools/darwin/packaging/xbmc-osx/Makefile similarity index 62% rename from tools/PackageMaker/Makefile rename to tools/darwin/packaging/xbmc-osx/Makefile index 40e94b3b94cc2..4b0990b184dc7 100644 --- a/tools/PackageMaker/Makefile +++ b/tools/darwin/packaging/xbmc-osx/Makefile @@ -1,8 +1,8 @@ -TARGET = ../../XBMC_for_Mac.dmg +TARGET = ../../../../XBMC_for_Mac.dmg all: $(TARGET) -include ../../Makefile.include +include ../../../../Makefile.include $(TARGET): dist/XBMC.dmg mv -f dist/XBMC.dmg $(TARGET) @@ -10,9 +10,9 @@ $(TARGET): dist/XBMC.dmg ifeq ($(findstring D_DEBUG,$(CFLAGS)), D_DEBUG) dist/XBMC.dmg: if [ -e "/Volumes/XBMC" ] ; then umount /Volumes/XBMC ; fi - ./dmgmaker.pl ../../build/Debug/XBMC.app + ./dmgmaker.pl ../../../../build/Debug/XBMC.app else dist/XBMC.dmg: if [ -e "/Volumes/XBMC" ] ; then umount /Volumes/XBMC ; fi - ./dmgmaker.pl ../../build/Release/XBMC.app + ./dmgmaker.pl ../../../../build/Release/XBMC.app endif diff --git a/tools/PackageMaker/VolumeDSStore b/tools/darwin/packaging/xbmc-osx/VolumeDSStore similarity index 100% rename from tools/PackageMaker/VolumeDSStore rename to tools/darwin/packaging/xbmc-osx/VolumeDSStore diff --git a/tools/PackageMaker/VolumeDSStoreApp b/tools/darwin/packaging/xbmc-osx/VolumeDSStoreApp similarity index 100% rename from tools/PackageMaker/VolumeDSStoreApp rename to tools/darwin/packaging/xbmc-osx/VolumeDSStoreApp diff --git a/tools/PackageMaker/VolumeIcon.icns b/tools/darwin/packaging/xbmc-osx/VolumeIcon.icns similarity index 100% rename from tools/PackageMaker/VolumeIcon.icns rename to tools/darwin/packaging/xbmc-osx/VolumeIcon.icns diff --git a/tools/PackageMaker/background/DiskImageBackground.png b/tools/darwin/packaging/xbmc-osx/background/DiskImageBackground.png similarity index 100% rename from tools/PackageMaker/background/DiskImageBackground.png rename to tools/darwin/packaging/xbmc-osx/background/DiskImageBackground.png diff --git a/tools/PackageMaker/background/DiskImageBackgroundDebug.png b/tools/darwin/packaging/xbmc-osx/background/DiskImageBackgroundDebug.png similarity index 100% rename from tools/PackageMaker/background/DiskImageBackgroundDebug.png rename to tools/darwin/packaging/xbmc-osx/background/DiskImageBackgroundDebug.png diff --git a/tools/PackageMaker/dmgmaker.pl b/tools/darwin/packaging/xbmc-osx/dmgmaker.pl similarity index 100% rename from tools/PackageMaker/dmgmaker.pl rename to tools/darwin/packaging/xbmc-osx/dmgmaker.pl diff --git a/tools/osx/packaging/xbmc-seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch b/tools/darwin/packaging/xbmc-seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch similarity index 100% rename from tools/osx/packaging/xbmc-seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch rename to tools/darwin/packaging/xbmc-seatbeltunlock/03e48c66a9cae1ff768eb3fe7981c499.patch diff --git a/tools/osx/packaging/xbmc-seatbeltunlock/12313417e3afeba6531255af58cb5283.patch b/tools/darwin/packaging/xbmc-seatbeltunlock/12313417e3afeba6531255af58cb5283.patch similarity index 100% rename from tools/osx/packaging/xbmc-seatbeltunlock/12313417e3afeba6531255af58cb5283.patch rename to tools/darwin/packaging/xbmc-seatbeltunlock/12313417e3afeba6531255af58cb5283.patch diff --git a/tools/osx/packaging/xbmc-seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch b/tools/darwin/packaging/xbmc-seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch similarity index 100% rename from tools/osx/packaging/xbmc-seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch rename to tools/darwin/packaging/xbmc-seatbeltunlock/42d00865f281bb662b6ce447c9815e59.patch diff --git a/tools/osx/packaging/xbmc-seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch b/tools/darwin/packaging/xbmc-seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch similarity index 100% rename from tools/osx/packaging/xbmc-seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch rename to tools/darwin/packaging/xbmc-seatbeltunlock/5a28620a15c15d41e1ae836dd1f95f8d.patch diff --git a/tools/osx/packaging/xbmc-seatbeltunlock/mkdeb-xbmc-seatbeltunlock.sh b/tools/darwin/packaging/xbmc-seatbeltunlock/mkdeb-xbmc-seatbeltunlock.sh similarity index 100% rename from tools/osx/packaging/xbmc-seatbeltunlock/mkdeb-xbmc-seatbeltunlock.sh rename to tools/darwin/packaging/xbmc-seatbeltunlock/mkdeb-xbmc-seatbeltunlock.sh diff --git a/tools/osx/ios-depends/Backrow/Makefile b/tools/osx/ios-depends/Backrow/Makefile deleted file mode 100644 index 05ec0d40fbc97..0000000000000 --- a/tools/osx/ios-depends/Backrow/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -SOURCE=Backrow -# download location and format -BASE_URL=http://xbmc-for-atv2.googlecode.com/svn/trunk/Backrow - -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) - -ARCHIVE=$(SOURCE).tar.gz -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -all: $(SOURCE) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - -.installed: - mkdir -p $(PREFIX)/include - cp -rf $(SOURCE) $(PREFIX)/include/ - touch $@ - -clean: -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/Makefile b/tools/osx/ios-depends/Makefile deleted file mode 100644 index fcd582e15234c..0000000000000 --- a/tools/osx/ios-depends/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -BUILDDIR=/Users/Shared/xbmc-depends/ios-4.2_arm7 - -SUBDIRS = \ - Backrow \ - gas-preprocessor help2man autoconf automake pkg-config tar dpkg cmake \ - pcre expat gettext readline sqlite3 \ - liblzo2 freetype2 fontconfig \ - openssl libssh2 curl \ - jpeg tiff libpng libogg \ - libvorbis libflac libmad fribidi libmpeg2 \ - libass libcdio libsamplerate librtmp \ - libmicrohttpd libmodplug libbluray libyajl \ - samba python26 mysqlclient boost - -.PHONY: setup $(SUBDIRS) - -all: setup $(SUBDIRS) - -setup: - mkdir -p $(BUILDDIR)/bin - mkdir -p $(BUILDDIR)/lib - mkdir -p $(BUILDDIR)/slib - mkdir -p $(BUILDDIR)/share - mkdir -p $(BUILDDIR)/include - -$(SUBDIRS): - $(MAKE) -C $@ - -fontconfig: freetype2 -libmad: gas-preprocessor - -clean: - for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done - -distclean:: - for d in $(SUBDIRS); do $(MAKE) -C $$d distclean; done - rm -rf build - rm -rf $(BUILDDIR) diff --git a/tools/osx/ios-depends/afpfs-ng/01-gcrypt.patch b/tools/osx/ios-depends/afpfs-ng/01-gcrypt.patch deleted file mode 100644 index 7bcace2812fe3..0000000000000 --- a/tools/osx/ios-depends/afpfs-ng/01-gcrypt.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ru afpfs-ng-0.8.1/configure.ac afpfs-ng-0.8.1+iPhone/configure.ac ---- afpfs-ng-0.8.1/configure.ac 2008-03-08 16:23:12.000000000 +0000 -+++ afpfs-ng-0.8.1+iPhone/configure.ac 2010-10-24 05:26:15.000000000 +0000 -@@ -50,21 +50,6 @@ - case $host in - *-*-darwin*) - AC_MSG_CHECKING([for correct gcrypt version]) -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([ -- #include -- #include ],[ -- char*p= GCRYPT_VERSION; -- unsigned int vers; -- vers=atoi(p)*10000; -- p=strchr(p,'.')+1; -- vers+=atoi(p)*100; -- p=strchr(p,'.')+1; -- vers+=atoi(p); -- if (vers<10400) return 1; -- ])], -- [AC_MSG_RESULT([yes])], -- [AC_MSG_ERROR([version is < 1.4.0])]) - AM_CONDITIONAL(HAVE_LIBGCRYPT, true) - AC_DEFINE([HAVE_LIBGCRYPT], [1] ) - ;; - diff --git a/tools/osx/ios-depends/afpfs-ng/Makefile b/tools/osx/ios-depends/afpfs-ng/Makefile deleted file mode 100644 index 693c40df49357..0000000000000 --- a/tools/osx/ios-depends/afpfs-ng/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=afpfs-ng -VERSION=0.8.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://downloads.sourceforge.net/sourceforge/afpfs-ng/ -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ ---disable-fuse ac_cv_func_malloc_0_nonnull=yes - -LIBDYLIB=$(SOURCE)/lib/.libs/libafpclient.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 <../01-gcrypt.patch - cd $(SOURCE); autoreconf -vif - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/autoconf/Makefile b/tools/osx/ios-depends/autoconf/Makefile deleted file mode 100644 index f0ac0aeed9638..0000000000000 --- a/tools/osx/ios-depends/autoconf/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -LIBNAME=autoconf -VERSION=2.63 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/ios-4.2_arm7 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) - -LIBDYLIB=$(SOURCE)/bin/autoconf - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - sed -i bak -e "s/'libtoolize'/'glibtoolize'/" $(SOURCE)/bin/autoreconf.in - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/automake/Makefile b/tools/osx/ios-depends/automake/Makefile deleted file mode 100644 index 4aee85bf2dff5..0000000000000 --- a/tools/osx/ios-depends/automake/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -LIBNAME=automake -VERSION=1.10.3 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs - -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/ios-4.2_arm7 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) - -LIBDYLIB=$(SOURCE)/bin/automake - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/boost/Makefile b/tools/osx/ios-depends/boost/Makefile deleted file mode 100644 index 176bc7d470ed4..0000000000000 --- a/tools/osx/ios-depends/boost/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -LIBNAME=boost -VERSION=1_44_0 -SOURCE=$(LIBNAME)_$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs - -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE=$(SOURCE).tar.bz2 -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -SDK_VERSION:=$(shell xcodebuild -showsdks | grep iphoneos | sort | tail -n 1 | awk '{ print $$2}') - -LIBDYLIB=$(PREFIX)/lib/libboost_thread.a - -all: $(LIBDYLIB) - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cat user-config.jam-ios-4.2_armv7.in > $(SOURCE)/tools/build/v2/user-config.jam - sed -ie "s/iPhoneOS*.*.sdk/iPhoneOS$(SDK_VERSION).sdk/g" "$(SOURCE)/tools/build/v2/user-config.jam" - cat $(SOURCE)/tools/build/v2/user-config.jam - cd $(SOURCE); ./bootstrap.sh --prefix=$(PREFIX) --with-libraries=thread - cd $(SOURCE); ./bjam --prefix=$(PREFIX) toolset=darwin-4.0 --architecture=arm target-os=iphone macosx-version=iphone-${SDK_VERSION} define=_LITTLE_ENDIAN install - -clean: - cd $(SOURCE); ./bjam --clean - rm -rf $(PREFIX)/include/boost - rm -f $(PREFIX)/lib/libboost* - rm -f .installed - -distclean:: - rm -rf $(PREFIX)/include/boost - rm -f $(PREFIX)/lib/libboost* - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/boost/user-config.jam-ios-4.2_armv7.in b/tools/osx/ios-depends/boost/user-config.jam-ios-4.2_armv7.in deleted file mode 100644 index eb55bb1ec57fd..0000000000000 --- a/tools/osx/ios-depends/boost/user-config.jam-ios-4.2_armv7.in +++ /dev/null @@ -1,5 +0,0 @@ -using darwin : 4.0 : g++-4.2 : - "-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk -arch armv7 -fvisibility=hidden -fvisibility-inlines-hidden -DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS" - "-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk -arch armv7 -fvisibility=hidden -fvisibility-inlines-hidden -DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS" - "-Wl,-syslibroot,/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk -arch armv7" -; \ No newline at end of file diff --git a/tools/osx/ios-depends/cmake/Makefile b/tools/osx/ios-depends/cmake/Makefile deleted file mode 100644 index 18a6be85b08f9..0000000000000 --- a/tools/osx/ios-depends/cmake/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -APPNAME=cmake -VERSION=2.8.4 -SOURCE=$(APPNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/ios-4.2_arm7 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./bootstrap --prefix=$(PREFIX) --host=$(HOST) - -APP=$(SOURCE)/$(APPNAME) - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(APP) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(APP): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/config.mk b/tools/osx/ios-depends/config.mk deleted file mode 100755 index e889b4a74e9ef..0000000000000 --- a/tools/osx/ios-depends/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Find where this Makefile is located -TOP := $(dir $(lastword $(MAKEFILE_LIST))) - -platform_os=iPhoneOS -platform_sdk_version:=$(shell xcodebuild -showsdks | grep iphoneos | sort | tail -n 1 | awk '{ print $$2}') -platform_min_version=iphoneos-version-min=4.1 -platform_gcc_version=4.2.1 -platform_host=arm-apple-darwin10 -platform_path=/Developer/Platforms/iPhoneOS.platform/Developer -platform_os_cflags=-march=armv7 -mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -Os -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2 -platform_os_ldflags=-march=armv7 -mcpu=cortex-a8 -prefix_path=/Users/Shared/xbmc-depends/ios-4.2_arm7 -platform_sdk_path=${platform_path}/SDKs/${platform_os}${platform_sdk_version}.sdk -platform_bin_path=${platform_path}/usr/bin - -export platform_sdk_version -export NM=/usr/bin/nm -export CPP=/usr/bin/cpp-4.2 -export CXXCPP=${CPP} -I${platform_sdk_path}/usr/include/c++/${platform_gcc_version}/${platform_host} -export CPPFLAGS=-I${platform_sdk_path}/usr/include -I${prefix_path}/include -export CC=${platform_bin_path}/${platform_host}-gcc-${platform_gcc_version} -export CFLAGS=-std=gnu99 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} -I${platform_sdk_path}/usr/include ${platform_os_cflags} -export LD=${platform_bin_path}/ld -export LDFLAGS=-m${platform_min_version} -isysroot ${platform_sdk_path} -L${platform_sdk_path}/usr/lib -L${platform_sdk_path}/usr/lib/system ${platform_os_ldflags} -L${prefix_path}/lib -export CXX=${platform_bin_path}/${platform_host}-g++-${platform_gcc_version} -I${platform_sdk_path}/usr/include/c++/${platform_gcc_version}/${platform_host} -export CXXFLAGS=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} -export AR=${platform_bin_path}/ar -export AS=${prefix_path}/bin/gas-preprocessor.pl ${CC} -export CCAS=--tag CC ${prefix_path}/bin/gas-preprocessor.pl ${CC} -export STRIP=${platform_bin_path}/strip -export RANLIB=${platform_bin_path}/ranlib -export ACLOCAL=aclocal -I ${prefix_path}/share/aclocal -I /Developer/usr/share/aclocal -export LIBTOOL=/Developer/usr/bin/glibtool -export LIBTOOLIZE=/Developer/usr/bin/glibtoolize -export HOST=${platform_host} -export PREFIX=${prefix_path} -export DEVROOT=${platform_path} -export SDKROOT=${platform_sdk_path} -export PKG_CONFIG_PATH=${prefix_path}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig -export PATH:=${prefix_path}/bin:${platform_bin_path}:/Developer/usr/bin:$(PATH) - diff --git a/tools/osx/ios-depends/curl/Makefile b/tools/osx/ios-depends/curl/Makefile deleted file mode 100644 index 9d1807cd0b52f..0000000000000 --- a/tools/osx/ios-depends/curl/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=curl -VERSION=7.19.4 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes ac_cv_file___dev_urandom_=yes - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/dpkg/Makefile b/tools/osx/ios-depends/dpkg/Makefile deleted file mode 100644 index 12cdf28faeef1..0000000000000 --- a/tools/osx/ios-depends/dpkg/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -APPNAME=dpkg -VERSION=1.14.30 -SOURCE=$(APPNAME)_$(VERSION) -SOURCE_DEBIAN=$(APPNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -export LIBTOOL=builds/unix/libtool -PREFIX:=/Users/Shared/xbmc-depends/ios-4.2_arm7 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) --enable-static --disable-shared - -CLEAN_FILES=$(ARCHIVE) $(SOURCE_DEBIAN) - -all: $(APPNAME) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE_DEBIAN): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE_DEBIAN) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE_DEBIAN) > .gitignore - cd $(SOURCE_DEBIAN); $(CONFIGURE) - -$(APPNAME): $(SOURCE_DEBIAN) - make -C $(SOURCE_DEBIAN)/lib CFLAGS="" LDFLAGS="" - make -C $(SOURCE_DEBIAN)/libcompat CFLAGS="" LDFLAGS="" - make -C $(SOURCE_DEBIAN)/src CFLAGS="" LDFLAGS="" - make -C $(SOURCE_DEBIAN)/dpkg-deb CFLAGS="" LDFLAGS="" - -.installed: - make -C $(SOURCE_DEBIAN)/dpkg-deb install - touch $@ - -clean: - make -C $(SOURCE_DEBIAN) clean - rm .installed - -distclean:: - rm -rf $(SOURCE_DEBIAN) .installed - diff --git a/tools/osx/ios-depends/expat/Makefile b/tools/osx/ios-depends/expat/Makefile deleted file mode 100644 index 83b51dc8cb79b..0000000000000 --- a/tools/osx/ios-depends/expat/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=expat -VERSION=2.0.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/fontconfig/01-fontconfig-cross-compile-fix.patch b/tools/osx/ios-depends/fontconfig/01-fontconfig-cross-compile-fix.patch deleted file mode 100644 index 334cbbaf81d16..0000000000000 --- a/tools/osx/ios-depends/fontconfig/01-fontconfig-cross-compile-fix.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur fontconfig-2.6.0.orig/doc/Makefile.am fontconfig-2.6.0/doc/Makefile.am ---- fontconfig-2.6.0.orig/doc/Makefile.am 2007-11-06 01:05:37.000000000 +0100 -+++ fontconfig-2.6.0/doc/Makefile.am 2010-05-22 00:03:00.000000000 +0200 -@@ -21,9 +21,10 @@ - # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - # PERFORMANCE OF THIS SOFTWARE. - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - DOC_SRC = $(srcdir) - DOC_MODULE = fontconfig -diff -Naur fontconfig-2.6.0.orig/fc-arch/Makefile.am fontconfig-2.6.0/fc-arch/Makefile.am ---- fontconfig-2.6.0.orig/fc-arch/Makefile.am 2008-01-02 17:44:39.000000000 +0100 -+++ fontconfig-2.6.0/fc-arch/Makefile.am 2010-05-21 23:59:18.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - -diff -Naur fontconfig-2.6.0.orig/fc-case/Makefile.am fontconfig-2.6.0/fc-case/Makefile.am ---- fontconfig-2.6.0.orig/fc-case/Makefile.am 2010-05-21 23:55:02.000000000 +0200 -+++ fontconfig-2.6.0/fc-case/Makefile.am 2010-05-22 00:04:09.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - -diff -Naur fontconfig-2.6.0.orig/fc-glyphname/Makefile.am fontconfig-2.6.0/fc-glyphname/Makefile.am ---- fontconfig-2.6.0.orig/fc-glyphname/Makefile.am 2008-01-02 17:44:39.000000000 +0100 -+++ fontconfig-2.6.0/fc-glyphname/Makefile.am 2010-05-22 00:04:54.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - -diff -Naur fontconfig-2.6.0.orig/fc-lang/Makefile.am fontconfig-2.6.0/fc-lang/Makefile.am ---- fontconfig-2.6.0.orig/fc-lang/Makefile.am 2008-01-02 17:44:39.000000000 +0100 -+++ fontconfig-2.6.0/fc-lang/Makefile.am 2010-05-22 00:05:44.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - diff --git a/tools/osx/ios-depends/fontconfig/Makefile b/tools/osx/ios-depends/fontconfig/Makefile deleted file mode 100644 index 298079fbcb193..0000000000000 --- a/tools/osx/ios-depends/fontconfig/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=fontconfig -VERSION=2.6.0 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --with-arch=arm --disable-libxml2 --disable-docs --with-freetype-config=$(PREFIX)/bin/freetype-config - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-fontconfig-cross-compile-fix.patch - cd $(SOURCE); autoreconf -vif; automake - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/freetype2/Makefile b/tools/osx/ios-depends/freetype2/Makefile deleted file mode 100644 index c38bd7530af74..0000000000000 --- a/tools/osx/ios-depends/freetype2/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=freetype -VERSION=2.3.9 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export LDFLAGS+=-Wl,-read_only_relocs,suppress -# force using internal libtool -export LIBTOOL=builds/unix/libtool -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --without-old-mac-fonts --without-fsspec --without-fsref --without-ats - -LIBDYLIB=$(SOURCE)/objs/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/fribidi/Makefile b/tools/osx/ios-depends/fribidi/Makefile deleted file mode 100644 index e62795138d3f7..0000000000000 --- a/tools/osx/ios-depends/fribidi/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=fribidi -VERSION=0.10.9 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-docs - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/gas-preprocessor/Makefile b/tools/osx/ios-depends/gas-preprocessor/Makefile deleted file mode 100644 index 1d4bdea571cb0..0000000000000 --- a/tools/osx/ios-depends/gas-preprocessor/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -GASBIN=$(PREFIX)/bin/gas-preprocessor.pl - -all: .installed - -.installed: - mkdir -p $(PREFIX)/bin - cp gas-preprocessor.pl $(GASBIN) - touch $@ - -clean: -distclean:: - rm $(GASBIN) .installed diff --git a/tools/osx/ios-depends/gas-preprocessor/README b/tools/osx/ios-depends/gas-preprocessor/README deleted file mode 100644 index d903ba107eac2..0000000000000 --- a/tools/osx/ios-depends/gas-preprocessor/README +++ /dev/null @@ -1,20 +0,0 @@ -To configure ffmpeg for the iPhone 3gs and iPod touch 3g: - -./configure --enable-cross-compile --arch=arm --target-os=darwin --cc='/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc -arch armv7' --sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk --cpu=cortex-a8 --enable-pic - -To configure ffmpeg for all other iPhones and iPods: - -./configure --enable-cross-compile --arch=arm --target-os=darwin --cc='/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc -arch armv6' --sysroot=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk --cpu=arm1176jzf-s - -Make sure to replace the iPhone SDK version with the version that you're using. -Pre-3.0 versions aren't supported and probably won't work. - -If deploying to all generations, it's recommended to do separate out-of-tree -builds for each architecture, then lipo together the resulting libs. For -instance, assuming separate builds in armv6 and armv7: - -lipo -create -arch armv6 armv6/libavcodec/libavcodec.a -arch armv7 armv7/libavcodec/libavcodec.a -output universal/libavcodec.a - -and similar for each library. Then in XCode, make sure to build for both armv6 -and armv7. If you only care about one generation (since the armv6 devices are -too slow for instance), then lipo is unnecessary of course. diff --git a/tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl b/tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl deleted file mode 100755 index fb81883d0f436..0000000000000 --- a/tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl +++ /dev/null @@ -1,360 +0,0 @@ -#!/usr/bin/env perl -# by David Conrad -# This code is licensed under GPLv2 or later; go to gnu.org to read it -# (not that it much matters for an asm preprocessor) -# usage: set your assembler to be something like "perl gas-preprocessor.pl gcc" -use strict; - -# Apple's gas is ancient and doesn't support modern preprocessing features like -# .rept and has ugly macro syntax, among other things. Thus, this script -# implements the subset of the gas preprocessor used by x264 and ffmpeg -# that isn't supported by Apple's gas. - -my @gcc_cmd = @ARGV; -my @preprocess_c_cmd; - -if (grep /\.c$/, @gcc_cmd) { - # C file (inline asm?) - compile - @preprocess_c_cmd = (@gcc_cmd, "-S"); -} elsif (grep /\.[sS]$/, @gcc_cmd) { - # asm file, just do C preprocessor - @preprocess_c_cmd = (@gcc_cmd, "-E"); -} else { - die "Unrecognized input filetype"; -} -@gcc_cmd = map { /\.[csS]$/ ? qw(-x assembler -) : $_ } @gcc_cmd; -@preprocess_c_cmd = map { /\.o$/ ? "-" : $_ } @preprocess_c_cmd; - -my $comm; - -# detect architecture from gcc binary name -if ($gcc_cmd[0] =~ /arm/) { - $comm = '@'; -} elsif ($gcc_cmd[0] =~ /powerpc|ppc/) { - $comm = '#'; -} - -# look for -arch flag -foreach my $i (1 .. $#gcc_cmd-1) { - if ($gcc_cmd[$i] eq "-arch") { - if ($gcc_cmd[$i+1] =~ /arm/) { - $comm = '@'; - } elsif ($gcc_cmd[$i+1] =~ /powerpc|ppc/) { - $comm = '#'; - } - } -} - -# assume we're not cross-compiling if no -arch or the binary doesn't have the arch name -if (!$comm) { - my $native_arch = qx/arch/; - if ($native_arch =~ /arm/) { - $comm = '@'; - } elsif ($native_arch =~ /powerpc|ppc/) { - $comm = '#'; - } -} - -if (!$comm) { - die "Unable to identify target architecture"; -} - -my %ppc_spr = (ctr => 9, - vrsave => 256); - -open(ASMFILE, "-|", @preprocess_c_cmd) || die "Error running preprocessor"; - -my $current_macro = ''; -my $macro_level = 0; -my %macro_lines; -my %macro_args; -my %macro_args_default; - -my @pass1_lines; -my @ifstack; - -# pass 1: parse .macro -# note that the handling of arguments is probably overly permissive vs. gas -# but it should be the same for valid cases -while () { - # remove all comments (to avoid interfering with evaluating directives) - s/$comm.*//x; - - # comment out unsupported directives - s/\.type/$comm.type/x; - s/\.func/$comm.func/x; - s/\.endfunc/$comm.endfunc/x; - s/\.ltorg/$comm.ltorg/x; - s/\.size/$comm.size/x; - s/\.fpu/$comm.fpu/x; - - # the syntax for these is a little different - s/\.global/.globl/x; - # also catch .section .rodata since the equivalent to .const_data is .section __DATA,__const - s/(.*)\.rodata/.const_data/x; - s/\.int/.long/x; - s/\.float/.single/x; - - # catch unknown section names that aren't mach-o style (with a comma) - if (/.section ([^,]*)$/) { - die ".section $1 unsupported; figure out the mach-o section name and add it"; - } - - parse_line($_); -} - -sub parse_line { - my $line = @_[0]; - - # evaluate .if blocks - if (scalar(@ifstack)) { - if (/\.endif/) { - pop(@ifstack); - return; - } elsif ($line =~ /\.elseif\s+(.*)/) { - if ($ifstack[-1] == 0) { - $ifstack[-1] = !!eval($1); - } elsif ($ifstack[-1] > 0) { - $ifstack[-1] = -$ifstack[-1]; - } - return; - } elsif (/\.else/) { - $ifstack[-1] = !$ifstack[-1]; - return; - } - - # discard lines in false .if blocks - if ($ifstack[-1] <= 0) { - return; - } - } - - if (/\.macro/) { - $macro_level++; - if ($macro_level > 1 && !$current_macro) { - die "nested macros but we don't have master macro"; - } - } elsif (/\.endm/) { - $macro_level--; - if ($macro_level < 0) { - die "unmatched .endm"; - } elsif ($macro_level == 0) { - $current_macro = ''; - return; - } - } - - if ($macro_level > 1) { - push(@{$macro_lines{$current_macro}}, $line); - } elsif ($macro_level == 0) { - expand_macros($line); - } else { - if (/\.macro\s+([\d\w\.]+)\s*(.*)/) { - $current_macro = $1; - - # commas in the argument list are optional, so only use whitespace as the separator - my $arglist = $2; - $arglist =~ s/,/ /g; - - my @args = split(/\s+/, $arglist); - foreach my $i (0 .. $#args) { - my @argpair = split(/=/, $args[$i]); - $macro_args{$current_macro}[$i] = $argpair[0]; - $argpair[0] =~ s/:vararg$//; - $macro_args_default{$current_macro}{$argpair[0]} = $argpair[1]; - } - # ensure %macro_lines has the macro name added as a key - $macro_lines{$current_macro} = []; - - } elsif ($current_macro) { - push(@{$macro_lines{$current_macro}}, $line); - } else { - die "macro level without a macro name"; - } - } -} - -sub expand_macros { - my $line = @_[0]; - - # handle .if directives; apple's assembler doesn't support important non-basic ones - # evaluating them is also needed to handle recursive macros - if ($line =~ /\.if(n?)([a-z]*)\s+(.*)/) { - my $result = $1 eq "n"; - my $type = $2; - my $expr = $3; - - if ($type eq "b") { - $expr =~ s/\s//g; - $result ^= $expr eq ""; - } elsif ($type eq "c") { - if ($expr =~ /(.*)\s*,\s*(.*)/) { - $result ^= $1 eq $2; - } else { - die "argument to .ifc not recognized"; - } - } elsif ($type eq "") { - $result ^= eval($expr) != 0; - } else { - die "unhandled .if varient"; - } - push (@ifstack, $result); - return; - } - - if (/\.purgem\s+([\d\w\.]+)/) { - delete $macro_lines{$1}; - delete $macro_args{$1}; - delete $macro_args_default{$1}; - return; - } - - if ($line =~ /(\S+:|)\s*([\w\d\.]+)\s*(.*)/ && exists $macro_lines{$2}) { - push(@pass1_lines, $1); - my $macro = $2; - - # commas are optional here too, but are syntactically important because - # parameters can be blank - my @arglist = split(/,/, $3); - my @args; - foreach (@arglist) { - my @whitespace_split = split(/\s+/, $_); - if (!@whitespace_split) { - push(@args, ''); - } else { - foreach (@whitespace_split) { - if (length($_)) { - push(@args, $_); - } - } - } - } - - my %replacements; - if ($macro_args_default{$macro}){ - %replacements = %{$macro_args_default{$macro}}; - } - - # construct hashtable of text to replace - foreach my $i (0 .. $#args) { - my $argname = $macro_args{$macro}[$i]; - - if ($args[$i] =~ m/=/) { - # arg=val references the argument name - # XXX: I'm not sure what the expected behaviour if a lot of - # these are mixed with unnamed args - my @named_arg = split(/=/, $args[$i]); - $replacements{$named_arg[0]} = $named_arg[1]; - } elsif ($i > $#{$macro_args{$macro}}) { - # more args given than the macro has named args - # XXX: is vararg allowed on arguments before the last? - $argname = $macro_args{$macro}[-1]; - if ($argname =~ s/:vararg$//) { - $replacements{$argname} .= ", $args[$i]"; - } else { - die "Too many arguments to macro $macro"; - } - } else { - $argname =~ s/:vararg$//; - $replacements{$argname} = $args[$i]; - } - } - - # apply replacements as regex - foreach (@{$macro_lines{$macro}}) { - my $macro_line = $_; - # do replacements by longest first, this avoids wrong replacement - # when argument names are subsets of each other - foreach (reverse sort {length $a <=> length $b} keys %replacements) { - $macro_line =~ s/\\$_/$replacements{$_}/g; - } - $macro_line =~ s/\\\(\)//g; # remove \() - parse_line($macro_line); - } - } else { - push(@pass1_lines, $line); - } -} - -close(ASMFILE) or exit 1; -open(ASMFILE, "|-", @gcc_cmd) or die "Error running assembler"; - -my @sections; -my $num_repts; -my $rept_lines; - -my %literal_labels; # for ldr , = -my $literal_num = 0; - -# pass 2: parse .rept and .if variants -# NOTE: since we don't implement a proper parser, using .rept with a -# variable assigned from .set is not supported -foreach my $line (@pass1_lines) { - # handle .previous (only with regard to .section not .subsection) - if ($line =~ /\.(section|text|const_data)/) { - push(@sections, $line); - } elsif ($line =~ /\.previous/) { - if (!$sections[-2]) { - die ".previous without a previous section"; - } - $line = $sections[-2]; - push(@sections, $line); - } - - # handle ldr , = - if ($line =~ /(.*)\s*ldr([\w\s\d]+)\s*,\s*=(.*)/) { - my $label = $literal_labels{$3}; - if (!$label) { - $label = ".Literal_$literal_num"; - $literal_num++; - $literal_labels{$3} = $label; - } - $line = "$1 ldr$2, $label\n"; - } elsif ($line =~ /\.ltorg/) { - foreach my $literal (keys %literal_labels) { - $line .= "$literal_labels{$literal}:\n .word $literal\n"; - } - %literal_labels = (); - } - - # @l -> lo16() @ha -> ha16() - $line =~ s/,\s+([^,]+)\@l\b/, lo16($1)/g; - $line =~ s/,\s+([^,]+)\@ha\b/, ha16($1)/g; - - # move to/from SPR - if ($line =~ /(\s+)(m[ft])([a-z]+)\s+(\w+)/ and exists $ppc_spr{$3}) { - if ($2 eq 'mt') { - $line = "$1${2}spr $ppc_spr{$3}, $4\n"; - } else { - $line = "$1${2}spr $4, $ppc_spr{$3}\n"; - } - } - - if ($line =~ /\.rept\s+(.*)/) { - $num_repts = $1; - $rept_lines = "\n"; - - # handle the possibility of repeating another directive on the same line - # .endr on the same line is not valid, I don't know if a non-directive is - if ($num_repts =~ s/(\.\w+.*)//) { - $rept_lines .= "$1\n"; - } - $num_repts = eval($num_repts); - } elsif ($line =~ /\.endr/) { - for (1 .. $num_repts) { - print ASMFILE $rept_lines; - } - $rept_lines = ''; - } elsif ($rept_lines) { - $rept_lines .= $line; - } else { - print ASMFILE $line; - } -} - -print ASMFILE ".text\n"; -foreach my $literal (keys %literal_labels) { - print ASMFILE "$literal_labels{$literal}:\n .word $literal\n"; -} - -close(ASMFILE) or exit 1; diff --git a/tools/osx/ios-depends/gettext/01-gettext-tools-Makefile.in.patch b/tools/osx/ios-depends/gettext/01-gettext-tools-Makefile.in.patch deleted file mode 100644 index da129dea470da..0000000000000 --- a/tools/osx/ios-depends/gettext/01-gettext-tools-Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gettext-tools/Makefile.in.orig 2010-06-03 16:38:55.000000000 -0500 -+++ gettext-tools/Makefile.in 2010-06-04 01:16:07.000000000 -0500 -@@ -724,7 +724,7 @@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies - ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples -+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests - - # Allow users to use "gnulib-tool --update". - diff --git a/tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch b/tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch deleted file mode 100644 index cc01d2f0d4436..0000000000000 --- a/tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gettext-0.17.orig/gettext-tools/gnulib-lib/stpncpy.c gettext-0.17/gettext-tools/gnulib-lib/stpncpy.c ---- gettext-0.17.orig/gettext-tools/gnulib-lib/stpncpy.c 2007-10-07 23:29:35.000000000 +0300 -+++ gettext-0.17/gettext-tools/gnulib-lib/stpncpy.c 2011-03-11 23:34:40.000000000 +0200 -@@ -24,7 +24,7 @@ - #include - - #ifndef weak_alias --# define __stpncpy stpncpy -+//# define __stpncpy stpncpy - #endif - - /* Copy no more than N bytes of SRC to DST, returning a pointer past the diff --git a/tools/osx/ios-depends/gettext/Makefile b/tools/osx/ios-depends/gettext/Makefile deleted file mode 100644 index 665029c4d513a..0000000000000 --- a/tools/osx/ios-depends/gettext/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=gettext -VERSION=0.17 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ - --disable-csharp --disable-native-java --without-emacs --disable-java \ - --disable-libasprintf --disable-csharp --disable-openmp --with-included-gettext \ - --without-git --without-cvs - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p0 <../01-gettext-tools-Makefile.in.patch - if [ "$(platform_sdk_version)" != "4.2" ]; then \ - cd $(SOURCE); patch -p1 <../02-gettext-tools-stpncpy.patch; \ - fi - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/help2man/Makefile b/tools/osx/ios-depends/help2man/Makefile deleted file mode 100644 index eff78b60d3af0..0000000000000 --- a/tools/osx/ios-depends/help2man/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=help2man -VERSION=1.38.2 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE_NATIVE= CFLAGS="" CXXFLAGS="" LDFLAGS="" CPPFLAGS="" \ - CPP="/usr/bin/cpp" \ - CC="gcc-4.2" \ - CXX="g++-4.2" \ - LD="ld" \ - ./configure --prefix=$(PREFIX) - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -LIBDYLIB=$(SOURCE)/help2man - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE_NATIVE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/jpeg/Makefile b/tools/osx/ios-depends/jpeg/Makefile deleted file mode 100644 index 5a84eb45cb001..0000000000000 --- a/tools/osx/ios-depends/jpeg/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=jpeg -VERSION=8b -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(LIBNAME)src.v$(VERSION).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libass/Makefile b/tools/osx/ios-depends/libass/Makefile deleted file mode 100644 index 26b531329c397..0000000000000 --- a/tools/osx/ios-depends/libass/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libass -VERSION=0.9.11 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) - -LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libbluray/Makefile b/tools/osx/ios-depends/libbluray/Makefile deleted file mode 100644 index 80038dd9baf7e..0000000000000 --- a/tools/osx/ios-depends/libbluray/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libblueray -VERSION=20110213.20739ed -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tgz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --exec-prefix=$(PREFIX) --host=$(HOST) - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - mkdir $(SOURCE) - cd $(SOURCE); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); ./bootstrap - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libcdio/Makefile b/tools/osx/ios-depends/libcdio/Makefile deleted file mode 100644 index bae02e4c18d09..0000000000000 --- a/tools/osx/ios-depends/libcdio/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libcdio -VERSION=0.82 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --without-cd-drive --without-cd-info --without-cd-read --without-cd-paranoia --without-cdda-player --without-iso-info --without-iso-read - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); autoconf - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - cp $(SOURCE)/include/cdio/cdtext.h $(PREFIX)/include/cdio/ - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libflac/Makefile b/tools/osx/ios-depends/libflac/Makefile deleted file mode 100644 index b50b6db35adb2..0000000000000 --- a/tools/osx/ios-depends/libflac/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=flac -VERSION=1.2.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --disable-asm-optimizations \ - --disable-xmms-plugin \ - --disable-cpplibs - -LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libgcrypt/Makefile b/tools/osx/ios-depends/libgcrypt/Makefile deleted file mode 100644 index a42f775e8db5e..0000000000000 --- a/tools/osx/ios-depends/libgcrypt/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libgcrypt -VERSION=1.4.0 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export CFLAGS+=-fgnu89-inline -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/libgcrypt.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); autoreconf -vif - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/libgpg-error/Makefile b/tools/osx/ios-depends/libgpg-error/Makefile deleted file mode 100644 index cb07b96927678..0000000000000 --- a/tools/osx/ios-depends/libgpg-error/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libgpg-error -VERSION=1.10 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --with-libintl-prefix=$(PREFIX)/lib - -LIBDYLIB=$(SOURCE)/.libs/libgpg-error.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/liblzo2/01-liblzo2-only-build-lib.patch b/tools/osx/ios-depends/liblzo2/01-liblzo2-only-build-lib.patch deleted file mode 100644 index f3d59609328ed..0000000000000 --- a/tools/osx/ios-depends/liblzo2/01-liblzo2-only-build-lib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN lzo-2.03.org/Makefile.am lzo-2.03/Makefile.am ---- lzo-2.03.org/Makefile.am 2008-04-30 08:51:49.000000000 -0400 -+++ lzo-2.03/Makefile.am 2010-10-29 12:38:51.000000000 -0400 -@@ -5,7 +5,7 @@ - - AUTOMAKE_OPTIONS = 1.9.6 gnu - --SUBDIRS = include src lzotest examples tests minilzo -+SUBDIRS = include src - - EXTRA_DIST = BUGS - -diff -ruN lzo-2.03.org/Makefile.in lzo-2.03/Makefile.in ---- lzo-2.03.org/Makefile.in 2008-04-30 08:51:49.000000000 -0400 -+++ lzo-2.03/Makefile.in 2010-10-29 12:56:42.000000000 -0400 -@@ -193,7 +193,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = 1.9.6 gnu --SUBDIRS = include src lzotest examples tests minilzo -+SUBDIRS = include src - EXTRA_DIST = BUGS - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - diff --git a/tools/osx/ios-depends/liblzo2/Makefile b/tools/osx/ios-depends/liblzo2/Makefile deleted file mode 100644 index bf7409a9cfdb5..0000000000000 --- a/tools/osx/ios-depends/liblzo2/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=lzo -VERSION=2.03 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME)2.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-liblzo2-only-build-lib.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libmad/01-libmad-pkgconfig.patch b/tools/osx/ios-depends/libmad/01-libmad-pkgconfig.patch deleted file mode 100644 index 0ac88acb8415d..0000000000000 --- a/tools/osx/ios-depends/libmad/01-libmad-pkgconfig.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am ---- libmad-0.15.1b.orig/Makefile.am 2004-02-17 02:02:03.000000000 +0000 -+++ libmad-0.15.1b/Makefile.am 2005-08-25 12:08:04.000000000 +0000 -@@ -33,9 +33,12 @@ - minimad_INCLUDES = - minimad_LDADD = libmad.la - --EXTRA_DIST = mad.h.sed \ -+EXTRA_DIST = mad.h.sed mad.pc.in \ - CHANGES COPYRIGHT CREDITS README TODO VERSION - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA= mad.pc -+ - exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ - synth.h decoder.h - -diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in ---- libmad-0.15.1b.orig/Makefile.in 2004-02-17 02:33:23.000000000 +0000 -+++ libmad-0.15.1b/Makefile.in 2005-08-25 12:09:34.000000000 +0000 -@@ -14,6 +14,8 @@ - - @SET_MAKE@ - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = mad.pc - - SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES) - -@@ -43,7 +45,7 @@ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(srcdir)/libmad.list.in \ - $(top_srcdir)/configure COPYING INSTALL TODO config.guess \ -- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs -+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac -@@ -53,7 +55,7 @@ - configure.lineno configure.status.lineno - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = libmad.list -+CONFIG_CLEAN_FILES = libmad.list mad.pc - am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -218,7 +220,7 @@ - minimad_SOURCES = minimad.c - minimad_INCLUDES = - minimad_LDADD = libmad.la --EXTRA_DIST = mad.h.sed \ -+EXTRA_DIST = mad.h.sed mad.pc.in \ - CHANGES COPYRIGHT CREDITS README TODO VERSION - - exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ -@@ -298,6 +300,28 @@ - rm -f stamp-h1 - touch $@ - -+mad.pc: $(top_builddir)/config.status mad.pc.in -+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+install-pkgconfigDATA: $(pkgconfig_DATA) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) -+ @list='$(pkgconfig_DATA)'; for p in $$list; do \ -+ if test -f $(srcdir)/$$p; then \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ -+ else if test -f $$p; then \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ -+ fi; fi; \ -+ done -+ -+uninstall-pkgconfigDATA: -+ @$(NORMAL_UNINSTALL) -+ list='$(pkgconfig_DATA)'; for p in $$list; do \ -+ rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ -+ done -+ - distclean-hdr: - -rm -f config.h stamp-h1 - libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in -@@ -726,7 +750,7 @@ - - info-am: - --install-data-am: install-includeHEADERS -+install-data-am: install-includeHEADERS install-pkgconfigDATA - - install-exec-am: install-libLTLIBRARIES - -@@ -757,7 +781,7 @@ - ps-am: - - uninstall-am: uninstall-includeHEADERS uninstall-info-am \ -- uninstall-libLTLIBRARIES -+ uninstall-libLTLIBRARIES install-pkgconfigDATA - - uninstall-info: uninstall-info-recursive - -diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in ---- libmad-0.15.1b.orig/mad.pc.in 1970-01-01 00:00:00.000000000 +0000 -+++ libmad-0.15.1b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: MAD -+Description: libmad - MPEG audio decoder library -+Version: @VERSION@ -+Libs: -L${libdir} -lmad -+Cflags: diff --git a/tools/osx/ios-depends/libmad/02-libmad-thumb-fix.patch b/tools/osx/ios-depends/libmad/02-libmad-thumb-fix.patch deleted file mode 100644 index 398dbec815d0d..0000000000000 --- a/tools/osx/ios-depends/libmad/02-libmad-thumb-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ruN libmad-0.15.1b.orig/imdct_l_arm.S libmad-0.15.1b/imdct_l_arm.S ---- libmad-0.15.1b.orig/imdct_l_arm.S.orig 2010-10-28 18:57:51.000000000 -0400 -+++ libmad-0.15.1b/imdct_l_arm.S 2010-10-28 18:58:41.000000000 -0400 -@@ -468,8 +468,11 @@ - - @---- - -- add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?) -- -+#ifdef __thumb__ -+ adr r2, imdct36_long_karray -+#else -+ add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?) -+#endif - - loop: - ldr r12, [r0, #X0] diff --git a/tools/osx/ios-depends/libmad/Makefile b/tools/osx/ios-depends/libmad/Makefile deleted file mode 100644 index af53ce84f8a7b..0000000000000 --- a/tools/osx/ios-depends/libmad/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmad -VERSION=0.15.1b -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --enable-fpm=default - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-libmad-pkgconfig.patch - cd $(SOURCE); patch -p1 < ../02-libmad-thumb-fix.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libmicrohttpd/Makefile b/tools/osx/ios-depends/libmicrohttpd/Makefile deleted file mode 100644 index 97d1bda92e735..0000000000000 --- a/tools/osx/ios-depends/libmicrohttpd/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmicrohttpd -VERSION=0.4.6 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs - -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --with-libgcrypt-prefix=/dev/null - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libmodplug/Makefile b/tools/osx/ios-depends/libmodplug/Makefile deleted file mode 100644 index 78cd79a5641ec..0000000000000 --- a/tools/osx/ios-depends/libmodplug/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmodplug -VERSION=0.8.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs - -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libmpeg2/01-libmpeg2-add-asm-leading-underscores.patch b/tools/osx/ios-depends/libmpeg2/01-libmpeg2-add-asm-leading-underscores.patch deleted file mode 100644 index 532e53af4e584..0000000000000 --- a/tools/osx/ios-depends/libmpeg2/01-libmpeg2-add-asm-leading-underscores.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ruN libmpeg2-0.5.1.org/libmpeg2/motion_comp_arm_s.S libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S ---- libmpeg2-0.5.1.org/libmpeg2/motion_comp_arm_s.S 2008-07-09 15:16:05.000000000 -0400 -+++ libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S 2010-10-29 13:33:02.000000000 -0400 -@@ -23,8 +23,8 @@ - - @ ---------------------------------------------------------------- - .align -- .global MC_put_o_16_arm --MC_put_o_16_arm: -+ .global _MC_put_o_16_arm -+_MC_put_o_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11, lr} @ R14 is also called LR -@@ -83,8 +83,8 @@ - - @ ---------------------------------------------------------------- - .align -- .global MC_put_o_8_arm --MC_put_o_8_arm: -+ .global _MC_put_o_8_arm -+_MC_put_o_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r10, lr} @ R14 is also called LR -@@ -152,8 +152,8 @@ - .endm - - .align -- .global MC_put_x_16_arm --MC_put_x_16_arm: -+ .global _MC_put_x_16_arm -+_MC_put_x_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11,lr} @ R14 is also called LR -@@ -244,8 +244,8 @@ - - @ ---------------------------------------------------------------- - .align -- .global MC_put_x_8_arm --MC_put_x_8_arm: -+ .global _MC_put_x_8_arm -+_MC_put_x_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11,lr} @ R14 is also called LR - diff --git a/tools/osx/ios-depends/libmpeg2/02-neon.patch b/tools/osx/ios-depends/libmpeg2/02-neon.patch deleted file mode 100644 index 329551b65e07d..0000000000000 --- a/tools/osx/ios-depends/libmpeg2/02-neon.patch +++ /dev/null @@ -1,385 +0,0 @@ -Index: include/mpeg2.h -=================================================================== ---- include/mpeg2.h (révision 1193) -+++ include/mpeg2.h (copie de travail) -@@ -164,6 +164,7 @@ - #define MPEG2_ACCEL_SPARC_VIS 1 - #define MPEG2_ACCEL_SPARC_VIS2 2 - #define MPEG2_ACCEL_ARM 1 -+#define MPEG2_ACCEL_ARM_NEON 2 - #define MPEG2_ACCEL_DETECT 0x80000000 - - uint32_t mpeg2_accel (uint32_t accel); -Index: libmpeg2/motion_comp_neon.c -=================================================================== ---- libmpeg2/motion_comp_neon.c (révision 0) -+++ libmpeg2/motion_comp_neon.c (révision 0) -@@ -0,0 +1,302 @@ -+/* -+ * motion_comp_neon.c -+ * Copyright (C) 2009 Rémi Denis-Courmont -+ * -+ * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. -+ * See http://libmpeg2.sourceforge.net/ for updates. -+ * -+ * mpeg2dec 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. -+ * -+ * mpeg2dec 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 mpeg2dec; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#include "config.h" -+ -+#if defined(ARCH_ARM) -+ -+#include -+#include -+ -+#include "mpeg2.h" -+#include "attributes.h" -+#include "mpeg2_internal.h" -+ -+/* dest = ref */ -+static void MC_put_o_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ memcpy (dest, ref, 16); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_put_o_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ memcpy (dest, ref, 8); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+/* dest = (src1 + src2 + 1) / 2 */ -+static void MC_avg_1_16_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[src1]]\n" -+ "vld1.u8 {q1}, [%[src2]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0", "q1"); -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_1_8_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[src1]]\n" -+ "vld1.u8 {d1}, [%[src2]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0"); -+ -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+/* dest = (dest + ((src1 + src2 + 1) / 2) + 1) / 2 */ -+static void MC_avg_2_16_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[src1]]\n" -+ "vld1.u8 {q1}, [%[src2]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ "vld1.u8 {q2}, [%[dest]]\n" -+ /* XXX: one cycle stall */ -+ "vrhadd.u8 q0, q0, q2\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0", "q1", "q2"); -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_2_8_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[src1]]\n" -+ "vld1.u8 {d1}, [%[src2]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vld1.u8 {d2}, [%[dest]]\n" -+ "vrhadd.u8 d0, d0, d2\n" -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0", "d2"); -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_o_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_16_neon (dest, dest, ref, stride, height); -+} -+ -+static void MC_avg_o_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_8_neon (dest, dest, ref, stride, height); -+} -+ -+static void MC_put_x_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_16_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_put_x_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_8_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_avg_x_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_16_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_avg_x_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_8_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_put_y_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_16_neon (dest, ref, ref + stride, stride, height); -+} -+static void MC_put_y_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_8_neon (dest, ref, ref + stride, stride, height); -+} -+ -+static void MC_avg_y_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_16_neon (dest, ref, ref + stride, stride, height); -+} -+ -+static void MC_avg_y_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_8_neon (dest, ref, ref + stride, stride, height); -+} -+ -+static void MC_put_xy_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[ref]]\n" -+ "vld1.u8 {q1}, [%[refx]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ "vld1.u8 {q2}, [%[refy]]\n" -+ "vld1.u8 {q3}, [%[refxy]]\n" -+ "vrhadd.u8 q2, q2, q3\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 q0, q0, q2\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1", "q2", "q3"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_put_xy_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[ref]]\n" -+ "vld1.u8 {d1}, [%[refx]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vld1.u8 {d2}, [%[refy]]\n" -+ "vld1.u8 {d3}, [%[refxy]]\n" -+ "vrhadd.u8 d2, d2, d3\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 d0, d0, d2\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_xy_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[ref]]\n" -+ "vld1.u8 {q1}, [%[refx]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ "vld1.u8 {q2}, [%[refy]]\n" -+ "vld1.u8 {q3}, [%[refxy]]\n" -+ "vrhadd.u8 q2, q2, q3\n" -+ "vld1.u8 {q4}, [%[dest]]\n" -+ /* XXX: one cycle stall */ -+ "vrhadd.u8 q0, q0, q2\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 q0, q4, q0\n" -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1", "q2", "q3", "q4"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_xy_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[ref]]\n" -+ "vld1.u8 {d1}, [%[refx]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vld1.u8 {d2}, [%[refy]]\n" -+ "vld1.u8 {d3}, [%[refxy]]\n" -+ "vrhadd.u8 d2, d2, d3\n" -+ "vld1.u8 {d4}, [%[dest]]\n" -+ /* XXX: one cycle stall */ -+ "vrhadd.u8 d0, d0, d2\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 d0, d4, d0\n" -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1", "d4"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+MPEG2_MC_EXTERN (neon) -+ -+#endif /* ARCH_ARM */ - -Modification de propriétés sur libmpeg2/motion_comp_neon.c -___________________________________________________________________ -Ajouté : svn:eol-style - + native - -Index: libmpeg2/mpeg2_internal.h -=================================================================== ---- libmpeg2/mpeg2_internal.h (révision 1193) -+++ libmpeg2/mpeg2_internal.h (copie de travail) -@@ -313,5 +313,6 @@ - extern mpeg2_mc_t mpeg2_mc_alpha; - extern mpeg2_mc_t mpeg2_mc_vis; - extern mpeg2_mc_t mpeg2_mc_arm; -+extern mpeg2_mc_t mpeg2_mc_neon; - - #endif /* LIBMPEG2_MPEG2_INTERNAL_H */ -Index: libmpeg2/motion_comp.c -=================================================================== ---- libmpeg2/motion_comp.c (révision 1193) -+++ libmpeg2/motion_comp.c (copie de travail) -@@ -58,6 +58,11 @@ - else - #endif - #ifdef ARCH_ARM -+#ifdef ARCH_ARM -+ if (accel & MPEG2_ACCEL_ARM) -+ mpeg2_mc = mpeg2_mc_neon; -+ else -+#endif - if (accel & MPEG2_ACCEL_ARM) { - mpeg2_mc = mpeg2_mc_arm; - } else -Index: libmpeg2/Makefile.am -=================================================================== ---- libmpeg2/Makefile.am (révision 1193) -+++ libmpeg2/Makefile.am (copie de travail) -@@ -14,7 +14,7 @@ - motion_comp_vis.c motion_comp_arm.c \ - cpu_accel.c cpu_state.c - if ARCH_ARM --libmpeg2arch_la_SOURCES += motion_comp_arm_s.S -+libmpeg2arch_la_SOURCES += motion_comp_arm_s.S motion_comp_neon.c - endif - libmpeg2arch_la_CFLAGS = $(OPT_CFLAGS) $(ARCH_OPT_CFLAGS) $(LIBMPEG2_CFLAGS) - -Index: configure.ac -=================================================================== ---- configure.ac (révision 1193) -+++ configure.ac (copie de travail) -@@ -103,7 +103,14 @@ - AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);; - arm*) - arm_conditional=: -- AC_DEFINE([ARCH_ARM],,[ARM architecture]);; -+ AC_DEFINE([ARCH_ARM],,[ARM architecture]) -+ AC_MSG_CHECKING([if inline ARM Advanced SIMD assembly is supported]) -+ AC_TRY_COMPILE([], -+ [asm ("vqmovun.s64 d0, q1":::"d0");], -+ [AC_DEFINE([ARCH_ARM_NEON],, [ARM Advanced SIMD assembly]) -+ AC_MSG_RESULT(yes)], -+ [AC_MSG_RESULT(no)]) -+ ;; - esac - elif test x"$CC" = x"tendracc"; then - dnl TenDRA portability checking compiler diff --git a/tools/osx/ios-depends/libmpeg2/03-config-fix.patch b/tools/osx/ios-depends/libmpeg2/03-config-fix.patch deleted file mode 100644 index 98f766ed6a3cf..0000000000000 --- a/tools/osx/ios-depends/libmpeg2/03-config-fix.patch +++ /dev/null @@ -1,208 +0,0 @@ ---- a/libmpeg2/Makefile.in 2011-01-29 10:17:27.000000000 +0100 -+++ b/libmpeg2/Makefile.in 2011-01-29 10:28:26.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,14 +33,17 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@ARCH_ARM_TRUE@am__append_1 = motion_comp_arm_s.S -+@ARCH_ARM_TRUE@am__append_1 = motion_comp_arm_s.S motion_comp_neon.c - subdir = libmpeg2 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/libmpeg2.pc.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/cflags.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/keywords.m4 \ -- $(top_srcdir)/m4/nonpic.m4 $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ -+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ -+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nonpic.m4 \ -+ $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -66,8 +69,9 @@ - am__libmpeg2arch_la_SOURCES_DIST = motion_comp_mmx.c idct_mmx.c \ - motion_comp_altivec.c idct_altivec.c motion_comp_alpha.c \ - idct_alpha.c motion_comp_vis.c motion_comp_arm.c cpu_accel.c \ -- cpu_state.c motion_comp_arm_s.S --@ARCH_ARM_TRUE@am__objects_1 = motion_comp_arm_s.lo -+ cpu_state.c motion_comp_arm_s.S motion_comp_neon.c -+@ARCH_ARM_TRUE@am__objects_1 = motion_comp_arm_s.lo \ -+@ARCH_ARM_TRUE@ libmpeg2arch_la-motion_comp_neon.lo - am_libmpeg2arch_la_OBJECTS = libmpeg2arch_la-motion_comp_mmx.lo \ - libmpeg2arch_la-idct_mmx.lo \ - libmpeg2arch_la-motion_comp_altivec.lo \ -@@ -82,7 +86,7 @@ - libmpeg2arch_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmpeg2arch_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/.auto/depcomp - am__depfiles_maybe = depfiles - CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -135,29 +139,25 @@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GREP = @GREP@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@ - LIBOBJS = @LIBOBJS@ -@@ -165,16 +165,20 @@ - LIBTOOL = @LIBTOOL@ - LIBVO_CFLAGS = @LIBVO_CFLAGS@ - LIBVO_LIBS = @LIBVO_LIBS@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@ -+NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPT_CFLAGS = @OPT_CFLAGS@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -199,8 +203,7 @@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -231,6 +234,7 @@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -301,8 +305,8 @@ - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -@@ -310,8 +314,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -355,6 +359,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_altivec.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_arm.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_mmx.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_vis.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_comp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_comp_arm_s.Plo@am__quote@ -@@ -472,6 +477,13 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmpeg2arch_la_CFLAGS) $(CFLAGS) -c -o libmpeg2arch_la-cpu_state.lo `test -f 'cpu_state.c' || echo '$(srcdir)/'`cpu_state.c - -+libmpeg2arch_la-motion_comp_neon.lo: motion_comp_neon.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmpeg2arch_la_CFLAGS) $(CFLAGS) -MT libmpeg2arch_la-motion_comp_neon.lo -MD -MP -MF $(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Tpo -c -o libmpeg2arch_la-motion_comp_neon.lo `test -f 'motion_comp_neon.c' || echo '$(srcdir)/'`motion_comp_neon.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Tpo $(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='motion_comp_neon.c' object='libmpeg2arch_la-motion_comp_neon.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmpeg2arch_la_CFLAGS) $(CFLAGS) -c -o libmpeg2arch_la-motion_comp_neon.lo `test -f 'motion_comp_neon.c' || echo '$(srcdir)/'`motion_comp_neon.c -+ - mostlyclean-libtool: - -rm -f *.lo - -@@ -570,8 +582,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -596,8 +608,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -607,12 +619,13 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -+ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique diff --git a/tools/osx/ios-depends/libmpeg2/Makefile b/tools/osx/ios-depends/libmpeg2/Makefile deleted file mode 100644 index ad32e720cf125..0000000000000 --- a/tools/osx/ios-depends/libmpeg2/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmpeg2 -VERSION=0.5.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export LDFLAGS+=-Wl,-read_only_relocs,suppress -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-sdl - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-libmpeg2-add-asm-leading-underscores.patch - cd $(SOURCE); patch -p0 < ../02-neon.patch - cd $(SOURCE); patch -p1 < ../03-config-fix.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libogg/Makefile b/tools/osx/ios-depends/libogg/Makefile deleted file mode 100644 index 4dde47cde7354..0000000000000 --- a/tools/osx/ios-depends/libogg/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libogg -VERSION=1.1.4 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libpng/Makefile b/tools/osx/ios-depends/libpng/Makefile deleted file mode 100644 index 6dc9fc53e3e6d..0000000000000 --- a/tools/osx/ios-depends/libpng/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libpng -#VERSION=1.4.4 -VERSION=1.2.38 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch b/tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch deleted file mode 100644 index 358a0ff6f7a4a..0000000000000 --- a/tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -uNr rtmpdump-2.3/Makefile rtmpdump-2.3-org/Makefile ---- rtmpdump-2.3/Makefile 2010-06-30 15:58:35.000000000 -0400 -+++ rtmpdump-2.3-org/Makefile 2011-01-23 13:50:03.000000000 -0500 -@@ -2,8 +2,8 @@ - - prefix=/usr/local - --CC=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld -+#CC=$(CROSS_COMPILE)gcc -+#LD=$(CROSS_COMPILE)ld - - SYS=posix - #SYS=mingw -@@ -33,10 +33,12 @@ - - LIBS_posix= - LIBS_mingw=-lws2_32 -lwinmm -lgdi32 -+LIBS_darwin= - LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) - - THREADLIB_posix=-lpthread - THREADLIB_mingw= -+THREADLIB_darwin=-lpthread - THREADLIB=$(THREADLIB_$(SYS)) - SLIBS=$(THREADLIB) $(LIBS) - -@@ -45,6 +47,7 @@ - - EXT_posix= - EXT_mingw=.exe -+EXT_darwin= - EXT=$(EXT_$(SYS)) - - all: $(LIBRTMP) progs -diff -uNr rtmpdump-2.3/librtmp/Makefile rtmpdump-2.3-org/librtmp/Makefile ---- rtmpdump-2.3/librtmp/Makefile 2010-06-30 16:01:28.000000000 -0400 -+++ rtmpdump-2.3-org/librtmp/Makefile 2011-01-23 13:56:46.000000000 -0500 -@@ -2,9 +2,9 @@ - - prefix=/usr/local - --CC=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld --AR=$(CROSS_COMPILE)ar -+#CC=$(CROSS_COMPILE)gcc -+#LD=$(CROSS_COMPILE)ld -+#AR=$(CROSS_COMPILE)ar - - SYS=posix - CRYPTO=OPENSSL -@@ -27,8 +27,14 @@ - - SO_posix=so.0 - SO_mingw=dll -+SO_darwin=0.dylib - SO_EXT=$(SO_$(SYS)) - -+SO_LDFLAGS_posix=-shared -Wl,-soname,$@ -+SO_LDFLAGS_mingw= -+SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace $(XLDFLAGS) -+SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) -+ - SHARED=yes - SODEF_yes=-fPIC - SOLIB_yes=librtmp.$(SO_EXT) -@@ -61,7 +67,7 @@ - $(AR) rs $@ $? - - librtmp.$(SO_EXT): $(OBJS) -- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) -+ $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) - ln -sf $@ librtmp.so - - log.o: log.c log.h Makefile -@@ -87,5 +93,9 @@ - cp librtmp.so.0 $(LIBDIR) - cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so - -+install_0.dylib: librtmp.0.dylib -+ cp librtmp.0.dylib $(LIBDIR) -+ cd $(LIBDIR); ln -sf librtmp.0.dylib librtmp.dylib -+ - install_dll: librtmp.dll - cp librtmp.dll $(BINDIR) diff --git a/tools/osx/ios-depends/librtmp/Makefile b/tools/osx/ios-depends/librtmp/Makefile deleted file mode 100644 index 2e4feead26ce1..0000000000000 --- a/tools/osx/ios-depends/librtmp/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=rtmpdump -VERSION=2.3 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tgz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-make_shared_lib_for_darwin-tag2.3.patch - -$(LIBDYLIB): $(SOURCE) - make SYS=darwin prefix=$(PREFIX) XCFLAGS="$(CFLAGS)" XLDFLAGS="$(LDFLAGS)" -C $(SOURCE)/librtmp - -.installed: - make SYS=darwin prefix=$(PREFIX) -C $(SOURCE)/librtmp install - touch $@ - -clean: - make SYS=darwin -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libsamplerate/01-libsamplerate-arm.patch b/tools/osx/ios-depends/libsamplerate/01-libsamplerate-arm.patch deleted file mode 100644 index b14b0dac571a7..0000000000000 --- a/tools/osx/ios-depends/libsamplerate/01-libsamplerate-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN libsamplerate-0.1.7/src/float_cast.h.org src/float_cast.h ---- libsamplerate-0.1.7/src/float_cast.h.org 2010-10-28 21:00:19.000000000 -0400 -+++ libsamplerate-0.1.7/src/float_cast.h 2010-10-28 21:00:52.000000000 -0400 -@@ -193,7 +193,7 @@ - return res [1] ; - } /* double2int */ - --#elif (defined (__MACH__) && defined (__APPLE__)) -+#elif (defined (__MACH__) && defined (__APPLE__) && !defined(__arm__)) - - /* For Apple MacOSX. */ - - diff --git a/tools/osx/ios-depends/libsamplerate/Makefile b/tools/osx/ios-depends/libsamplerate/Makefile deleted file mode 100644 index 363449fe009fa..0000000000000 --- a/tools/osx/ios-depends/libsamplerate/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libsamplerate -VERSION=0.1.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-sndfile --disable-fftw - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-libsamplerate-arm.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libssh2/Makefile b/tools/osx/ios-depends/libssh2/Makefile deleted file mode 100644 index 84df92fcd239c..0000000000000 --- a/tools/osx/ios-depends/libssh2/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libssh2 -VERSION=1.2.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --with-openssl --without-libgcrypt ac_cv_func_EVP_aes_128_ctr=no - -SHELL := /bin/bash -RM := rm -rf - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/libvorbis/Makefile b/tools/osx/ios-depends/libvorbis/Makefile deleted file mode 100644 index bf3e1ca7c0a2d..0000000000000 --- a/tools/osx/ios-depends/libvorbis/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libvorbis -VERSION=1.2.3 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-oggtest --disable-docs --disable-examples - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - sed -ie "s|DDARWIN -fno-common -force_cpusubtype_ALL|DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL|" "$(SOURCE)/configure" - sed -ie "s|SUBDIRS = m4 include vq lib examples test doc|SUBDIRS = m4 include lib|" "$(SOURCE)/Makefile.in" - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libyajl/Makefile b/tools/osx/ios-depends/libyajl/Makefile deleted file mode 100644 index 6928f460d5ee0..0000000000000 --- a/tools/osx/ios-depends/libyajl/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=lloyd-yajl -VERSION=1.0.12 -SOURCE=lloyd-yajl-17b1790 -ARCHIVE=lloyd-yajl-1.0.12-0-g17b1790.tar.gz -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) - -LIBDYLIB=$(SOURCE)/build/yajl-1.0.12/lib/libyajl.dylib - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - sed -ie "s|ADD_CUSTOM_TARGET|#ADD_CUSTOM_TARGET|g" "$(SOURCE)/CMakeLists.txt" - sed -ie "s|./run_tests.sh|#./run_tests.sh|g" "$(SOURCE)/CMakeLists.txt" - sed -ie "s|WORKING_DIRECTORY|#WORKING_DIRECTORY|g" "$(SOURCE)/CMakeLists.txt" - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/mysqlclient/Makefile b/tools/osx/ios-depends/mysqlclient/Makefile deleted file mode 100644 index 885857749a7ca..0000000000000 --- a/tools/osx/ios-depends/mysqlclient/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -LIBNAME=mysql -VERSION=5.0.89 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE)-ios.tar.gz -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -all: $(SOURCE) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - -.installed: - cp -rf $(SOURCE)/* $(PREFIX) - install_name_tool -id $(PREFIX)/lib/mysql/libmysqlclient.15.dylib $(PREFIX)/lib/mysql/libmysqlclient.dylib - touch $@ - -clean: -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/openssl/Makefile b/tools/osx/ios-depends/openssl/Makefile deleted file mode 100644 index 4c0915a8a625f..0000000000000 --- a/tools/osx/ios-depends/openssl/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=openssl -VERSION=0.9.8r -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./Configure darwin-i386-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX) - -LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - sed -ie "s|Developer/usr/bin/arm-apple-darwin10-gcc-4.2.1|Developer/usr/bin/gcc-4.2|" "$(SOURCE)/Makefile" - sed -ie "s|CFLAG= |CFLAG=-arch armv7 -isysroot ${SDKROOT} |" "$(SOURCE)/Makefile" - sed -ie "s|-arch i386|-arch armv7|" "$(SOURCE)/Makefile" - sed -ie "s|static volatile sig_atomic_t intr_signal;|static volatile intr_signal;|" "$(SOURCE)/crypto/ui/ui_openssl.c" - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install_sw - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/pcre/Makefile b/tools/osx/ios-depends/pcre/Makefile deleted file mode 100644 index e81744313f1a5..0000000000000 --- a/tools/osx/ios-depends/pcre/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=pcre -VERSION=7.9 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --disable-stack-for-recursion - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/pkg-config/Makefile b/tools/osx/ios-depends/pkg-config/Makefile deleted file mode 100644 index 71f04d0a0cdc6..0000000000000 --- a/tools/osx/ios-depends/pkg-config/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -LIBNAME=pkg-config -VERSION=0.23 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/ios-4.2_arm7 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) --enable-indirect-deps --with-pc-path=$(PREFIX)/lib/pkgconfig:$(PREFIX)/share/pkgconfig - -LIBDYLIB=$(SOURCE)/bin/pkg-config - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/python26/Makefile b/tools/osx/ios-depends/python26/Makefile deleted file mode 100644 index ef326523e42dc..0000000000000 --- a/tools/osx/ios-depends/python26/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install -# -# credits to: -# http://randomsplat.com/id5-cross-compiling-python-for-embedded-linux.html -# http://github.com/cobbal/python-for-iphone - -include ../config.mk - -# lib name, version -LIBNAME=Python -VERSION=2.6.5 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export LDFLAGS+=-Lextralibs/ -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ - CC="$(DEVROOT)/usr/bin/gcc-4.2 -arch armv7" \ - LD="$(DEVROOT)/usr/bin/ld -arch armv7" \ - --disable-toolbox-glue - -CONFIGURE_NATIVE= CFLAGS="" CXXFLAGS="" LDFLAGS="" CPPFLAGS="" \ - CPP="/usr/bin/cpp" \ - CC="gcc-4.2" \ - CXX="g++-4.2" \ - LD="ld" \ - ./configure - -LIBDYLIB=$(SOURCE)/libpython2.6.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE_NATIVE) - cd $(SOURCE); make python.exe Parser/pgen - cd $(SOURCE); mv python.exe hostpython - cd $(SOURCE); mv Parser/pgen Parser/hostpgen - cd $(SOURCE); mv libpython2.6.a hostlibpython2.6.a - cd $(SOURCE); make distclean - cd $(SOURCE); patch -p1 <../Python-2.6.5-xcompile.patch - cd $(SOURCE); mkdir -p extralibs; ln -sf "$(SDKROOT)/usr/lib/libgcc_s.1.dylib" extralibs/libgcc_s.10.4.dylib - cd $(SOURCE); $(CONFIGURE) - cd $(SOURCE); make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen CROSS_COMPILE_TARGET=yes - -.installed: - cd $(SOURCE); make install HOSTPYTHON=./hostpython CROSS_COMPILE_TARGET=yes - find $(PREFIX)/lib/python2.6 -type f -name *.pyc -exec rm -f {} \; - find $(PREFIX)/lib/python2.6 -type f -name *.pyo -exec rm -f {} \; - #find $(PREFIX)/lib/python2.6 -type d -name *test* -exec rm -rf {} \; - touch $@ - -clean: - rm -rf $(SOURCE) .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/python26/Python-2.6.5-xcompile.patch b/tools/osx/ios-depends/python26/Python-2.6.5-xcompile.patch deleted file mode 100644 index 51df2d347d981..0000000000000 --- a/tools/osx/ios-depends/python26/Python-2.6.5-xcompile.patch +++ /dev/null @@ -1,301 +0,0 @@ -diff -uN Python-2.6.2/configure Python-2.6.2POld/configure ---- Python-2.6.2/configure 2009-03-31 03:56:14.000000000 +1000 - -@@ -24326,14 +24326,14 @@ - - { echo "$as_me:$LINENO: checking for %zd printf() format support" >&5 - echo $ECHO_N "checking for %zd printf() format support... $ECHO_C" >&6; } --if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF -+#if test "$cross_compiling" = yes; then -+# { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -+#See \`config.log' for more details." >&5 -+#echo "$as_me: error: cannot run test program while cross compiling -+#See \`config.log' for more details." >&2;} -+# { (exit 1); exit 1; }; } -+#else -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -24411,7 +24411,7 @@ - echo "${ECHO_T}no" >&6; } - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -+#fi - - - -diff -uN Python-2.6.2/configure.in Python-2.6.2POld/configure.in ---- Python-2.6.2/configure.in 2009-03-31 03:56:14.000000000 +1000 -+++ Python-2.6.2POld/configure.in 2009-08-17 12:19:15.000000000 +1000 -@@ -3656,48 +3656,48 @@ - AC_MSG_RESULT(no) - fi - --AC_MSG_CHECKING(for %zd printf() format support) --AC_TRY_RUN([#include --#include --#include -- --#ifdef HAVE_SYS_TYPES_H --#include --#endif -- --#ifdef HAVE_SSIZE_T --typedef ssize_t Py_ssize_t; --#elif SIZEOF_VOID_P == SIZEOF_LONG --typedef long Py_ssize_t; --#else --typedef int Py_ssize_t; --#endif -- --int main() --{ -- char buffer[256]; -- -- if(sprintf(buffer, "%zd", (size_t)123) < 0) -- return 1; -- -- if (strcmp(buffer, "123")) -- return 1; -- -- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) -- return 1; -- -- if (strcmp(buffer, "-123")) -- return 1; -- -- return 0; --}], --[AC_MSG_RESULT(yes) -- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], -- AC_MSG_RESULT(no)) -+#AC_MSG_CHECKING(for %zd printf() format support) -+#AC_TRY_RUN([#include -+##include -+##include -+ -+##ifdef HAVE_SYS_TYPES_H -+##include -+##endif -+ -+##ifdef HAVE_SSIZE_T -+#typedef ssize_t Py_ssize_t; -+##elif SIZEOF_VOID_P == SIZEOF_LONG -+#typedef long Py_ssize_t; -+##else -+#typedef int Py_ssize_t; -+##endif -+# -+#int main() -+#{ -+# char buffer[256]; -+# -+# if(sprintf(buffer, "%zd", (size_t)123) < 0) -+# return 1;# -+# -+# if (strcmp(buffer, "123")) -+# return 1; -+# -+# if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) -+# return 1; -+# -+# if (strcmp(buffer, "-123")) -+# return 1; -+# -+# return 0; -+#}], -+#[AC_MSG_RESULT(yes) -+# AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], -+# AC_MSG_RESULT(no)) - - AC_CHECK_TYPE(socklen_t,, - AC_DEFINE(socklen_t,int, -- Define to `int' if does not define.),[ -+ Define to 'int' if does not define.),[ - #ifdef HAVE_SYS_TYPES_H - #include - #endif -diff -uN Python-2.6.2/Makefile.pre.in Python-2.6.2POld/Makefile.pre.in ---- Python-2.6.2/Makefile.pre.in 2009-02-24 21:07:44.000000000 +1000 -+++ Python-2.6.2POld/Makefile.pre.in 2009-08-17 12:19:15.000000000 +1000 -@@ -175,6 +175,7 @@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= ./$(BUILDPYTHON) - - # The task to run while instrument when building the profile-opt target - PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck -@@ -206,6 +207,8 @@ - # Parser - PGEN= Parser/pgen$(EXE) - -+HOSTPGEN= $(PGEN) -+ - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -394,8 +397,8 @@ - # Build the shared modules - sharedmods: $(BUILDPYTHON) - @case $$MAKEFLAGS in \ -- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac - - # Build static library -@@ -517,7 +520,7 @@ - - $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) - -@$(INSTALL) -d Include -- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -886,24 +889,24 @@ - done; \ - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" -+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): -@@ -1001,7 +1004,8 @@ - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILE='$(CROSS_COMPILE)' \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -diff -uN Python-2.6.2/setup.py Python-2.6.2POld/setup.py ---- Python-2.6.2/setup.py 2009-04-01 04:20:48.000000000 +1000 -+++ Python-2.6.2POld/setup.py 2009-08-17 12:19:15.000000000 +1000 -@@ -17,7 +17,7 @@ - from distutils.command.install_lib import install_lib - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+disabled_module_list = ['_ctypes', '_curses', '_curses_panel', '_cursesmodule', '_tkinter', 'syslogmodule', 'nismodule'] - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -267,33 +267,40 @@ - self.announce('WARNING: skipping import check for Cygwin-based "%s"' - % ext.name) - return -+ if os.environ.get('CROSS_COMPILE_TARGET') == 'yes': -+ return -+ - ext_filename = os.path.join( - self.build_lib, - self.get_ext_filename(self.get_ext_fullname(ext.name))) - try: - imp.load_dynamic(ext.name, ext_filename) - except ImportError, why: -- self.failed.append(ext.name) -- self.announce('*** WARNING: renaming "%s" since importing it' -- ' failed: %s' % (ext.name, why), level=3) -- assert not self.inplace -- basename, tail = os.path.splitext(ext_filename) -- newname = basename + "_failed" + tail -- if os.path.exists(newname): -- os.remove(newname) -- os.rename(ext_filename, newname) -- -- # XXX -- This relies on a Vile HACK in -- # distutils.command.build_ext.build_extension(). The -- # _built_objects attribute is stored there strictly for -- # use here. -- # If there is a failure, _built_objects may not be there, -- # so catch the AttributeError and move on. -- try: -- for filename in self._built_objects: -- os.remove(filename) -- except AttributeError: -- self.announce('unable to remove files (ignored)') -+ if os.environ.get('CROSS_COMPILE_TARGET') != "yes": -+ self.announce('*** WARNING: renaming "%s" since importing it' -+ ' failed: %s' % (ext.name, why), level=3) -+ assert not self.inplace -+ basename, tail = os.path.splitext(ext_filename) -+ newname = basename + "_failed" + tail -+ if os.path.exists(newname): -+ os.remove(newname) -+ os.rename(ext_filename, newname) -+ -+ # XXX -- This relies on a Vile HACK in -+ # distutils.command.build_ext.build_extension(). The -+ # _built_objects attribute is stored there strictly for -+ # use here. -+ # If there is a failure, _built_objects may not be there, -+ # so catch the AttributeError and move on. -+ try: -+ for filename in self._built_objects: -+ os.remove(filename) -+ except AttributeError: -+ self.announce('unable to remove files (ignored)') -+ else: -+ self.announce('WARNING: "%s" failed importing, but we leave it ' -+ 'because we are cross-compiling' % -+ ext.name) - except: - exc_type, why, tb = sys.exc_info() - self.announce('*** WARNING: importing extension "%s" ' -@@ -665,7 +672,7 @@ - - if (ssl_incs is not None and - ssl_libs is not None and -- openssl_ver >= 0x00907000): -+ openssl_ver >= 0x00907000 and False): - # The _hashlib module wraps optimized implementations - # of hash functions from the OpenSSL library. - exts.append( Extension('_hashlib', ['_hashopenssl.c'], -@@ -685,7 +692,7 @@ - depends = ['md5.h']) ) - missing.append('_hashlib') - -- if (openssl_ver < 0x00908000): -+ if (True or openssl_ver < 0x00908000): - # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash - exts.append( Extension('_sha256', ['sha256module.c']) ) - exts.append( Extension('_sha512', ['sha512module.c']) ) - diff --git a/tools/osx/ios-depends/readline/Makefile b/tools/osx/ios-depends/readline/Makefile deleted file mode 100644 index d11f34a6954b8..0000000000000 --- a/tools/osx/ios-depends/readline/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=readline -VERSION=6.0 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - ac_cv_header_termcap_h=no - -LIBDYLIB=$(SOURCE)/shlib/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); autoconf - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/samba/Makefile b/tools/osx/ios-depends/samba/Makefile deleted file mode 100644 index 1e9de256f2c96..0000000000000 --- a/tools/osx/ios-depends/samba/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=samba -VERSION=3.5.6 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export LDFLAGS+=-Wl,-unexported_symbol,_MD5* -lc -# believe it or not, this is how you setup samba for cross-compile -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --without-cluster-support --disable-swat --without-ldap --with-fhs \ - ac_cv_header_libunwind_h=no \ - ac_cv_header_execinfo_h=no \ - ac_cv_header_rpcsvc_ypclnt_h=no \ - libreplace_cv_HAVE_C99_VSNPRINTF=yes \ - samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no \ - samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ - -LIBDYLIB=$(SOURCE)/source3/bin/libsmbclient.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE)/source3; ./autogen.sh - cd $(SOURCE)/source3; $(CONFIGURE) - cp -f /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(platform_sdk_version).sdk/usr/include/crt_externs.h $(PREFIX)/include/ - cd $(SOURCE)/source3; make bin/libsmbclient.dylib - -.installed: - cp -f $(SOURCE)/source3/include/libsmbclient.h $(PREFIX)/include/ - cp -f $(SOURCE)/source3/bin/libtdb.dylib.1 $(PREFIX)/lib/ - cp -f $(SOURCE)/source3/bin/libtalloc.dylib.2 $(PREFIX)/lib/ - cp -f $(SOURCE)/source3/bin/libsmbclient.dylib.0 $(PREFIX)/lib/ - cd $(PREFIX)/lib; ln -sf libsmbclient.dylib.0 libsmbclient.dylib - install_name_tool -id $(PREFIX)/lib/libtdb.dylib.1 $(PREFIX)/lib/libtdb.dylib.1 - install_name_tool -id $(PREFIX)/lib/libtalloc.dylib.2 $(PREFIX)/lib/libtalloc.dylib.2 - install_name_tool -id $(PREFIX)/lib/libsmbclient.dylib.0 $(PREFIX)/lib/libsmbclient.dylib.0 - install_name_tool -change bin/libtdb.dylib.1 $(PREFIX)/lib/libtdb.dylib.1 \ - $(PREFIX)/lib/libsmbclient.dylib.0 - install_name_tool -change bin/libtalloc.dylib.2 $(PREFIX)/lib/libtalloc.dylib.2 \ - $(PREFIX)/lib/libsmbclient.dylib.0 - touch $@ - -clean: - make -C $(SOURCE)/source3 clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed .gitignore diff --git a/tools/osx/ios-depends/sqlite3/Makefile b/tools/osx/ios-depends/sqlite3/Makefile deleted file mode 100644 index 25e0fe442bd88..0000000000000 --- a/tools/osx/ios-depends/sqlite3/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=sqlite -VERSION=3.6.11 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export CXXFLAGS+=-DSQLITE_ENABLE_COLUMN_METADATA=1 -export TCLLIBDIR=/dev/null -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ - --enable-threadsafe --disable-tcl \ - --with-readline-inc="-I${PREFIX}/include" \ - --with-readline-lib="-L${PREFIX}/lib -lreadline -lm -lncurses" - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/tar/Makefile b/tools/osx/ios-depends/tar/Makefile deleted file mode 100644 index 62cf9bcbd33d0..0000000000000 --- a/tools/osx/ios-depends/tar/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# app name, version -APPNAME=tar -VERSION=1.23 -SOURCE=$(APPNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -#BASE_URL=http://ftp.gnu.org/gnu/tar -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -export LIBTOOL=builds/unix/libtool -PREFIX:=/Users/Shared/xbmc-depends/ios-4.2_arm7 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) \ ---program-transform-name=s/tar/gtar/ --disable-dependency-tracking - -CLEAN_FILES=$(ARCHIVE) $(SOURCE)/src/tar - -all: $(SOURCE)/src/tar .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(SOURCE)/src/tar: $(SOURCE) - cd $(SOURCE); make - -.installed: - make -C $(SOURCE) install - cd $(PREFIX)/bin; ln -sf gtar tar; ln -sf gtar gnutar - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/ios-depends/test/configure b/tools/osx/ios-depends/test/configure deleted file mode 100755 index 6b6415b912d2f..0000000000000 --- a/tools/osx/ios-depends/test/configure +++ /dev/null @@ -1,1820 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - -ac_subst_vars='PKG_CONFIG -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -' - ac_precious_vars='build_alias -host_alias -target_alias -PKG_CONFIG' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF -_ACEOF -fi - -if test -n "$ac_init_help"; then - - cat <<\_ACEOF - -Some influential environment variables: - PKG_CONFIG path to pkg-config utility - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -configure -generated by GNU Autoconf 2.63 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi - -fi diff --git a/tools/osx/ios-depends/test/configure.ac b/tools/osx/ios-depends/test/configure.ac deleted file mode 100644 index 0eba08e95c368..0000000000000 --- a/tools/osx/ios-depends/test/configure.ac +++ /dev/null @@ -1,3 +0,0 @@ -AC_INIT - -PKG_PROG_PKG_CONFIG diff --git a/tools/osx/ios-depends/tiff/Makefile b/tools/osx/ios-depends/tiff/Makefile deleted file mode 100644 index 018feea1de62f..0000000000000 --- a/tools/osx/ios-depends/tiff/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=tiff -VERSION=3.8.2 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared - -LIBDYLIB=$(SOURCE)/libtiff/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/xbmc/Makefile b/tools/osx/ios-depends/xbmc/Makefile deleted file mode 100644 index 99d0c6fe8175e..0000000000000 --- a/tools/osx/ios-depends/xbmc/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# A quick and dirty Makefile to configure xbmc -# - -include ../config.mk - -SOURCE=../../../../ -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --with-arch=arm --with-cpu=cortex-a8 --enable-gles \ - --disable-optical-drive --disable-dvdcss --enable-optimizations \ - PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig - -all: configure - -configure: - cd $(SOURCE); ./bootstrap - cd $(SOURCE); $(CONFIGURE) - #cd $(SOURCE); make xcode_depends diff --git a/tools/osx/org.xbmc.helper.plist b/tools/osx/org.xbmc.helper.plist deleted file mode 100644 index 206918e563ef8..0000000000000 --- a/tools/osx/org.xbmc.helper.plist +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Label - org.xbmc.helper - ProgramArguments - - ${PATH} - ${ARG1} - - RunAtLoad - - - diff --git a/tools/osx/osx-depends/Makefile b/tools/osx/osx-depends/Makefile deleted file mode 100644 index 493f8326766e2..0000000000000 --- a/tools/osx/osx-depends/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -BUILDDIR=/Users/Shared/xbmc-depends/osx-10.4_i386 - -SUBDIRS = \ - help2man autoconf automake libtool pkg-config yasm cmake \ - pcre expat gettext readline sqlite3 \ - liblzo liblzo2 freetype2 fontconfig \ - openssl libssh2 curl \ - jpeg tiff libpng libogg \ - libvorbis libflac libmad fribidi libmpeg2 \ - faad2 libass libcdio libsamplerate librtmp libcrystalhd \ - libGLEW libsdl libsdl_mixer libsdl_image \ - libmicrohttpd libmodplug libbluray libyajl \ - samba python26 mysqlclient boost \ - -.PHONY: setup $(SUBDIRS) - -all: setup $(SUBDIRS) - -setup: - mkdir -p $(BUILDDIR)/bin - mkdir -p $(BUILDDIR)/lib - mkdir -p $(BUILDDIR)/slib - mkdir -p $(BUILDDIR)/share - mkdir -p $(BUILDDIR)/include - -$(SUBDIRS): - $(MAKE) -C $@ - -clean: - for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done - -distclean:: - for d in $(SUBDIRS); do $(MAKE) -C $$d distclean; done - rm -rf $(BUILDDIR) diff --git a/tools/osx/osx-depends/afpfs-ng/01-gcrypt.patch b/tools/osx/osx-depends/afpfs-ng/01-gcrypt.patch deleted file mode 100644 index 7bcace2812fe3..0000000000000 --- a/tools/osx/osx-depends/afpfs-ng/01-gcrypt.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ru afpfs-ng-0.8.1/configure.ac afpfs-ng-0.8.1+iPhone/configure.ac ---- afpfs-ng-0.8.1/configure.ac 2008-03-08 16:23:12.000000000 +0000 -+++ afpfs-ng-0.8.1+iPhone/configure.ac 2010-10-24 05:26:15.000000000 +0000 -@@ -50,21 +50,6 @@ - case $host in - *-*-darwin*) - AC_MSG_CHECKING([for correct gcrypt version]) -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([ -- #include -- #include ],[ -- char*p= GCRYPT_VERSION; -- unsigned int vers; -- vers=atoi(p)*10000; -- p=strchr(p,'.')+1; -- vers+=atoi(p)*100; -- p=strchr(p,'.')+1; -- vers+=atoi(p); -- if (vers<10400) return 1; -- ])], -- [AC_MSG_RESULT([yes])], -- [AC_MSG_ERROR([version is < 1.4.0])]) - AM_CONDITIONAL(HAVE_LIBGCRYPT, true) - AC_DEFINE([HAVE_LIBGCRYPT], [1] ) - ;; - diff --git a/tools/osx/osx-depends/afpfs-ng/Makefile b/tools/osx/osx-depends/afpfs-ng/Makefile deleted file mode 100644 index 7e6de548bee6c..0000000000000 --- a/tools/osx/osx-depends/afpfs-ng/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=afpfs-ng -VERSION=0.8.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://downloads.sourceforge.net/sourceforge/afpfs-ng/ -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ ---disable-fuse - -LIBDYLIB=$(SOURCE)/lib/.libs/libafpclient.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 <../01-gcrypt.patch - cd $(SOURCE); autoreconf -vif - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/autoconf/Makefile b/tools/osx/osx-depends/autoconf/Makefile deleted file mode 100644 index 08e6f14f527f1..0000000000000 --- a/tools/osx/osx-depends/autoconf/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -LIBNAME=autoconf -VERSION=2.63 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) - -LIBDYLIB=$(SOURCE)/bin/autoconf - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - sed -i bak -e "s/'libtoolize'/'glibtoolize'/" $(SOURCE)/bin/autoreconf.in - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/automake/Makefile b/tools/osx/osx-depends/automake/Makefile deleted file mode 100644 index f8122d65fba85..0000000000000 --- a/tools/osx/osx-depends/automake/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -LIBNAME=automake -VERSION=1.10.3 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs - -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) - -LIBDYLIB=$(SOURCE)/bin/automake - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/boost/Makefile b/tools/osx/osx-depends/boost/Makefile deleted file mode 100644 index bd0c3c5161a85..0000000000000 --- a/tools/osx/osx-depends/boost/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -LIBNAME=boost -VERSION=1_44_0 -SOURCE=$(LIBNAME)_$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs - -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE=$(SOURCE).tar.bz2 -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -LIBDYLIB=$(PREFIX)/lib/libboost_thread.dylib - -all: $(LIBDYLIB) - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cat user-config.jam-osx-10.4_i386.in >> $(SOURCE)/tools/build/v2/user-config.jam - cd $(SOURCE); ./bootstrap.sh --prefix=$(PREFIX) --with-libraries=thread - cd $(SOURCE); ./bjam --prefix=$(PREFIX) toolset=darwin-4.0 --architecture=x86 address-model=32 target-os=darwin macosx-version=10.4 macosx-version-min=10.4 --link=static install - -clean: - cd $(SOURCE); ./bjam --clean - rm -rf $(PREFIX)/include/boost - rm -f $(PREFIX)/lib/libboost* - rm -f .installed - -distclean:: - rm -rf $(PREFIX)/include/boost - rm -f $(PREFIX)/lib/libboost* - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/osx-depends/boost/user-config.jam-osx-10.4_i386.in b/tools/osx/osx-depends/boost/user-config.jam-osx-10.4_i386.in deleted file mode 100644 index 6d90da3bffcd5..0000000000000 --- a/tools/osx/osx-depends/boost/user-config.jam-osx-10.4_i386.in +++ /dev/null @@ -1,5 +0,0 @@ -using darwin : 4.0 : g++-4.0 : - "-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -fvisibility=hidden -fvisibility-inlines-hidden -DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS" - "-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -fvisibility=hidden -fvisibility-inlines-hidden -DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS" - "-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386" -; \ No newline at end of file diff --git a/tools/osx/osx-depends/cmake/Makefile b/tools/osx/osx-depends/cmake/Makefile deleted file mode 100644 index 79c2cb9e979a6..0000000000000 --- a/tools/osx/osx-depends/cmake/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -APPNAME=cmake -VERSION=2.8.4 -SOURCE=$(APPNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./bootstrap --prefix=$(PREFIX) --host=$(HOST) - -APP=$(SOURCE)/$(APPNAME) - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(APP) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(APP): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/config.mk b/tools/osx/osx-depends/config.mk deleted file mode 100755 index f98c0d23c1bb2..0000000000000 --- a/tools/osx/osx-depends/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Find where this Makefile is located -TOP := $(dir $(lastword $(MAKEFILE_LIST))) - -platform_os=MacOSX -platform_sdk_version=10.4u -platform_min_version=macosx-version-min=10.4 -platform_gcc_version=4.0.1 -platform_host=i386-apple-darwin8 -platform_path=/Developer -platform_os_cflags=-arch i386 -no_compact_linkedit -platform_os_ldflags=-arch i386 -no_compact_linkedit -prefix_path=/Users/Shared/xbmc-depends/osx-10.4_i386 -platform_sdk_path=${platform_path}/SDKs/${platform_os}${platform_sdk_version}.sdk -platform_bin_path=${platform_path}/usr/bin - -export platform_sdk_version -export NM=/usr/bin/nm -export CPP=/usr/bin/cpp-4.0 -export CXXCPP=${CPP} -export CPPFLAGS=-no-cpp-precomp -I${prefix_path}/include -export CC=/usr/bin/gcc-4.0 -export CFLAGS=-std=gnu89 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} -I${platform_sdk_path}/usr/include -export LD=${platform_bin_path}/ld -export LDFLAGS=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_ldflags} -L${prefix_path}/lib -L${platform_sdk_path}/usr/lib -export CXX=/usr/bin/g++-4.0 -export CXXFLAGS=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} -export AR=${platform_bin_path}/ar -export AS=${platform_bin_path}/as -export STRIP=${platform_bin_path}/strip -export RANLIB=${platform_bin_path}/ranlib -export ACLOCAL=aclocal -I ${prefix_path}/share/aclocal -I /Developer/usr/share/aclocal -export LIBTOOL=${prefix_path}/bin/glibtool -export LIBTOOLIZE=${prefix_path}/bin/glibtoolize -export HOST=${platform_host} -export PREFIX=${prefix_path} -export DEVROOT=${platform_path} -export SDKROOT=${platform_sdk_path} -export PKG_CONFIG_PATH=${prefix_path}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig -export PATH:=${prefix_path}/bin:${platform_bin_path}:/Developer/usr/bin:$(PATH) -export MACOSX_DEPLOYMENT_TARGET=10.4 - diff --git a/tools/osx/osx-depends/curl/Makefile b/tools/osx/osx-depends/curl/Makefile deleted file mode 100644 index 683038746b6a4..0000000000000 --- a/tools/osx/osx-depends/curl/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=curl -VERSION=7.19.4 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/dpkg/Makefile b/tools/osx/osx-depends/dpkg/Makefile deleted file mode 100644 index 5ec273a631e78..0000000000000 --- a/tools/osx/osx-depends/dpkg/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -APPNAME=dpkg -VERSION=1.14.30 -SOURCE=$(APPNAME)_$(VERSION) -SOURCE_DEBIAN=$(APPNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -export LIBTOOL=builds/unix/libtool -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) --enable-static --disable-shared - -CLEAN_FILES=$(ARCHIVE) $(SOURCE_DEBIAN) - -all: $(APPNAME) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE_DEBIAN): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE_DEBIAN) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE_DEBIAN) > .gitignore - cd $(SOURCE_DEBIAN); $(CONFIGURE) - -$(APPNAME): $(SOURCE_DEBIAN) - make -C $(SOURCE_DEBIAN)/lib CFLAGS="" LDFLAGS="" - make -C $(SOURCE_DEBIAN)/libcompat CFLAGS="" LDFLAGS="" - make -C $(SOURCE_DEBIAN)/src CFLAGS="" LDFLAGS="" - make -C $(SOURCE_DEBIAN)/dpkg-deb CFLAGS="" LDFLAGS="" - -.installed: - make -C $(SOURCE_DEBIAN)/dpkg-deb install - touch $@ - -clean: - make -C $(SOURCE_DEBIAN) clean - rm .installed - -distclean:: - rm -rf $(SOURCE_DEBIAN) .installed - diff --git a/tools/osx/osx-depends/expat/Makefile b/tools/osx/osx-depends/expat/Makefile deleted file mode 100644 index 21e12877fa1ea..0000000000000 --- a/tools/osx/osx-depends/expat/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=expat -VERSION=2.0.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/faad2/Makefile b/tools/osx/osx-depends/faad2/Makefile deleted file mode 100644 index 4e95bdc5518f1..0000000000000 --- a/tools/osx/osx-depends/faad2/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=faad2 -VERSION=2.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/libfaad/.libs/libfaad.2.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) >> .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/fontconfig/01-fontconfig-cross-compile-fix.patch b/tools/osx/osx-depends/fontconfig/01-fontconfig-cross-compile-fix.patch deleted file mode 100644 index 334cbbaf81d16..0000000000000 --- a/tools/osx/osx-depends/fontconfig/01-fontconfig-cross-compile-fix.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur fontconfig-2.6.0.orig/doc/Makefile.am fontconfig-2.6.0/doc/Makefile.am ---- fontconfig-2.6.0.orig/doc/Makefile.am 2007-11-06 01:05:37.000000000 +0100 -+++ fontconfig-2.6.0/doc/Makefile.am 2010-05-22 00:03:00.000000000 +0200 -@@ -21,9 +21,10 @@ - # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - # PERFORMANCE OF THIS SOFTWARE. - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - DOC_SRC = $(srcdir) - DOC_MODULE = fontconfig -diff -Naur fontconfig-2.6.0.orig/fc-arch/Makefile.am fontconfig-2.6.0/fc-arch/Makefile.am ---- fontconfig-2.6.0.orig/fc-arch/Makefile.am 2008-01-02 17:44:39.000000000 +0100 -+++ fontconfig-2.6.0/fc-arch/Makefile.am 2010-05-21 23:59:18.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - -diff -Naur fontconfig-2.6.0.orig/fc-case/Makefile.am fontconfig-2.6.0/fc-case/Makefile.am ---- fontconfig-2.6.0.orig/fc-case/Makefile.am 2010-05-21 23:55:02.000000000 +0200 -+++ fontconfig-2.6.0/fc-case/Makefile.am 2010-05-22 00:04:09.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - -diff -Naur fontconfig-2.6.0.orig/fc-glyphname/Makefile.am fontconfig-2.6.0/fc-glyphname/Makefile.am ---- fontconfig-2.6.0.orig/fc-glyphname/Makefile.am 2008-01-02 17:44:39.000000000 +0100 -+++ fontconfig-2.6.0/fc-glyphname/Makefile.am 2010-05-22 00:04:54.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - -diff -Naur fontconfig-2.6.0.orig/fc-lang/Makefile.am fontconfig-2.6.0/fc-lang/Makefile.am ---- fontconfig-2.6.0.orig/fc-lang/Makefile.am 2008-01-02 17:44:39.000000000 +0100 -+++ fontconfig-2.6.0/fc-lang/Makefile.am 2010-05-22 00:05:44.000000000 +0200 -@@ -22,9 +22,10 @@ - # PERFORMANCE OF THIS SOFTWARE. - # - --CC = @CC_FOR_BUILD@ - EXEEXT = @EXEEXT_FOR_BUILD@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - - INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - diff --git a/tools/osx/osx-depends/fontconfig/Makefile b/tools/osx/osx-depends/fontconfig/Makefile deleted file mode 100644 index 04ccca2f32aaf..0000000000000 --- a/tools/osx/osx-depends/fontconfig/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=fontconfig -VERSION=2.6.0 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --with-arch=arm --disable-libxml2 --disable-docs --with-freetype-config=$(PREFIX)/bin/freetype-config - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-fontconfig-cross-compile-fix.patch - cd $(SOURCE); autoreconf -vif; automake - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/freetype2/Makefile b/tools/osx/osx-depends/freetype2/Makefile deleted file mode 100644 index 8fe53cff52154..0000000000000 --- a/tools/osx/osx-depends/freetype2/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=freetype -VERSION=2.3.9 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -# force using internal libtool -export LIBTOOL=builds/unix/libtool -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --without-old-mac-fonts --without-fsspec --without-fsref --without-ats - -LIBDYLIB=$(SOURCE)/objs/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/fribidi/Makefile b/tools/osx/osx-depends/fribidi/Makefile deleted file mode 100644 index 935c8920375a5..0000000000000 --- a/tools/osx/osx-depends/fribidi/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=fribidi -VERSION=0.19.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-docs - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/gettext/01-gettext-tools-Makefile.in.patch b/tools/osx/osx-depends/gettext/01-gettext-tools-Makefile.in.patch deleted file mode 100644 index da129dea470da..0000000000000 --- a/tools/osx/osx-depends/gettext/01-gettext-tools-Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gettext-tools/Makefile.in.orig 2010-06-03 16:38:55.000000000 -0500 -+++ gettext-tools/Makefile.in 2010-06-04 01:16:07.000000000 -0500 -@@ -724,7 +724,7 @@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies - ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples -+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests - - # Allow users to use "gnulib-tool --update". - diff --git a/tools/osx/osx-depends/gettext/Makefile b/tools/osx/osx-depends/gettext/Makefile deleted file mode 100644 index 2f5895e79ecc5..0000000000000 --- a/tools/osx/osx-depends/gettext/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=gettext -VERSION=0.17 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ - --disable-csharp --disable-native-java --disable-java --without-emacs \ - --disable-libasprintf --disable-openmp \ - --with-included-gettext \ - --with-included-glib \ - --with-included-libcroco \ - --with-included-libxml \ - --without-git --without-cvs - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p0 <../01-gettext-tools-Makefile.in.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/help2man/Makefile b/tools/osx/osx-depends/help2man/Makefile deleted file mode 100644 index eff78b60d3af0..0000000000000 --- a/tools/osx/osx-depends/help2man/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=help2man -VERSION=1.38.2 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE_NATIVE= CFLAGS="" CXXFLAGS="" LDFLAGS="" CPPFLAGS="" \ - CPP="/usr/bin/cpp" \ - CC="gcc-4.2" \ - CXX="g++-4.2" \ - LD="ld" \ - ./configure --prefix=$(PREFIX) - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -LIBDYLIB=$(SOURCE)/help2man - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE_NATIVE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/jpeg/Makefile b/tools/osx/osx-depends/jpeg/Makefile deleted file mode 100644 index 9c55e8837d1b7..0000000000000 --- a/tools/osx/osx-depends/jpeg/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=jpeg -VERSION=8b -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(LIBNAME)src.v$(VERSION).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libGLEW/01-Makefile.patch b/tools/osx/osx-depends/libGLEW/01-Makefile.patch deleted file mode 100644 index c48dbd460ac05..0000000000000 --- a/tools/osx/osx-depends/libGLEW/01-Makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.orig 2010-11-04 07:55:35.000000000 +1100 -+++ Makefile 2010-11-16 18:00:37.000000000 +1100 -@@ -89,7 +89,7 @@ - mkdir bin - - lib/$(LIB.STATIC): $(LIB.OBJS) -- $(AR) cr $@ $^ -+ $(AR) crs $@ $^ - - lib/$(LIB.SHARED): $(LIB.SOBJS) - $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) -@@ -146,7 +146,6 @@ - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ - else -- $(STRIP) -x lib/$(LIB.STATIC) - $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ - $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) - endif diff --git a/tools/osx/osx-depends/libGLEW/02-Makefile.darwin.patch b/tools/osx/osx-depends/libGLEW/02-Makefile.darwin.patch deleted file mode 100644 index d1b652a10bed8..0000000000000 --- a/tools/osx/osx-depends/libGLEW/02-Makefile.darwin.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- config/Makefile.darwin.orig 2010-11-04 07:55:35.000000000 +1100 -+++ config/Makefile.darwin 2010-11-16 18:28:44.000000000 +1100 -@@ -1,13 +1,13 @@ - NAME = $(GLEW_NAME) --CC = cc --LD = cc --CFLAGS.EXTRA = -no-cpp-precomp -dynamic -fno-common -+CC = $(CC.ARCH) -+LD = $(CC.ARCH) -+CFLAGS.EXTRA = -dynamic -fno-common $(CFLAGS.ARCH) - ifneq (undefined, $(origin GLEW_MX)) - CFLAGS.EXTRA += -DGLEW_MX - endif - PICFLAG = -fPIC - LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) --LDFLAGS.EXTRA = -+LDFLAGS.EXTRA = $(LDFLAGS.ARCH) - ifneq (undefined, $(origin GLEW_APPLE_GLX)) - CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' - LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGLU -lGL -lXext -lX11 diff --git a/tools/osx/osx-depends/libGLEW/Makefile b/tools/osx/osx-depends/libGLEW/Makefile deleted file mode 100644 index 69a8dad5184a0..0000000000000 --- a/tools/osx/osx-depends/libGLEW/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=glew -VERSION=1.5.8 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tgz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export GLEW_DEST=$(PREFIX) -export CC.ARCH=/usr/bin/gcc-4.0 -export CFLAGS.ARCH=$(CFLAGS) -export LDFLAGS.ARCH=$(LDFLAGS) - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p0 < ../01-Makefile.patch - cd $(SOURCE); patch -p0 < ../02-Makefile.darwin.patch - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libass/Makefile b/tools/osx/osx-depends/libass/Makefile deleted file mode 100644 index 26b531329c397..0000000000000 --- a/tools/osx/osx-depends/libass/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libass -VERSION=0.9.11 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) - -LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libbluray/Makefile b/tools/osx/osx-depends/libbluray/Makefile deleted file mode 100644 index 80038dd9baf7e..0000000000000 --- a/tools/osx/osx-depends/libbluray/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libblueray -VERSION=20110213.20739ed -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tgz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --exec-prefix=$(PREFIX) --host=$(HOST) - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - mkdir $(SOURCE) - cd $(SOURCE); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); ./bootstrap - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libcdio/Makefile b/tools/osx/osx-depends/libcdio/Makefile deleted file mode 100644 index 68e6c3dc08f03..0000000000000 --- a/tools/osx/osx-depends/libcdio/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libcdio -VERSION=0.82 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); autoconf - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - cp $(SOURCE)/include/cdio/cdtext.h $(PREFIX)/include/cdio/ - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libcrystalhd/Makefile b/tools/osx/osx-depends/libcrystalhd/Makefile deleted file mode 100644 index 9c05a51429818..0000000000000 --- a/tools/osx/osx-depends/libcrystalhd/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include ../config.mk - -SOURCE=libcrystalhd - -all: .installed - -.installed: - mkdir -p $(PREFIX)/include - cp -rf $(SOURCE) $(PREFIX)/include/ - touch $@ - -clean: -distclean:: - rm -f .installed - diff --git a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/bc_dts_defs.h b/tools/osx/osx-depends/libcrystalhd/libcrystalhd/bc_dts_defs.h deleted file mode 100644 index 2bffb80631a14..0000000000000 --- a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/bc_dts_defs.h +++ /dev/null @@ -1,635 +0,0 @@ -/******************************************************************** - * Copyright(c) 2006-2009 Broadcom Corporation. - * - * Name: bc_dts_defs.h - * - * Description: Common definitions for all components. Only types - * is allowed to be included from this file. - * - * AU - * - * HISTORY: - * - ******************************************************************** - * This header is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 2.1 of the License. - * - * This header 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 Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License - * along with this header. If not, see . - *******************************************************************/ - -#ifndef _BC_DTS_DEFS_H_ -#define _BC_DTS_DEFS_H_ - -#include "bc_dts_types.h" - -/* BIT Mask */ -#define BC_BIT(_x) (1 << (_x)) - -typedef enum _BC_STATUS { - BC_STS_SUCCESS = 0, - BC_STS_INV_ARG = 1, - BC_STS_BUSY = 2, - BC_STS_NOT_IMPL = 3, - BC_STS_PGM_QUIT = 4, - BC_STS_NO_ACCESS = 5, - BC_STS_INSUFF_RES = 6, - BC_STS_IO_ERROR = 7, - BC_STS_NO_DATA = 8, - BC_STS_VER_MISMATCH = 9, - BC_STS_TIMEOUT = 10, - BC_STS_FW_CMD_ERR = 11, - BC_STS_DEC_NOT_OPEN = 12, - BC_STS_ERR_USAGE = 13, - BC_STS_IO_USER_ABORT = 14, - BC_STS_IO_XFR_ERROR = 15, - BC_STS_DEC_NOT_STARTED = 16, - BC_STS_FWHEX_NOT_FOUND = 17, - BC_STS_FMT_CHANGE = 18, - BC_STS_HIF_ACCESS = 19, - BC_STS_CMD_CANCELLED = 20, - BC_STS_FW_AUTH_FAILED = 21, - BC_STS_BOOTLOADER_FAILED = 22, - BC_STS_CERT_VERIFY_ERROR = 23, - BC_STS_DEC_EXIST_OPEN = 24, - BC_STS_PENDING = 25, - BC_STS_CLK_NOCHG = 26, - - /* Must be the last one.*/ - BC_STS_ERROR = -1 -} BC_STATUS; - -/*------------------------------------------------------* - * Registry Key Definitions * - *------------------------------------------------------*/ -#define BC_REG_KEY_MAIN_PATH "Software\\Broadcom\\MediaPC\\CrystalHD" -#define BC_REG_KEY_FWPATH "FirmwareFilePath" -#define BC_REG_KEY_SEC_OPT "DbgOptions" - -/* - * Options: - * - * b[5] = Enable RSA KEY in EEPROM Support - * b[6] = Enable Old PIB scheme. (0 = Use PIB with video scheme) - * - * b[12] = Enable send message to NotifyIcon - * - */ - -typedef enum _BC_SW_OPTIONS { - BC_OPT_DOSER_OUT_ENCRYPT = BC_BIT(3), - BC_OPT_LINK_OUT_ENCRYPT = BC_BIT(29), -} BC_SW_OPTIONS; - -typedef struct _BC_REG_CONFIG{ - uint32_t DbgOptions; -} BC_REG_CONFIG; - -#if defined(__KERNEL__) || defined(__LINUX_USER__) -#else -/* Align data structures */ -#define ALIGN(x) __declspec(align(x)) -#endif - -/* mode - * b[0]..b[7] = _DtsDeviceOpenMode - * b[8] = Load new FW - * b[9] = Load file play back FW - * b[10] = Disk format (0 for HD DVD and 1 for BLU ray) - * b[11]-b[15] = default output resolution - * b[16] = Skip TX CPB Buffer Check - * b[17] = Adaptive Output Encrypt/Scramble Scheme - * b[18]-b[31] = reserved for future use - */ - -/* To allow multiple apps to open the device. */ -enum _DtsDeviceOpenMode { - DTS_PLAYBACK_MODE = 0, - DTS_DIAG_MODE, - DTS_MONITOR_MODE, - DTS_HWINIT_MODE -}; - -/* To enable the filter to selectively enable/disable fixes or erratas */ -enum _DtsDeviceFixMode { - DTS_LOAD_NEW_FW = BC_BIT(8), - DTS_LOAD_FILE_PLAY_FW = BC_BIT(9), - DTS_DISK_FMT_BD = BC_BIT(10), - /* b[11]-b[15] : Default output resolution */ - DTS_SKIP_TX_CHK_CPB = BC_BIT(16), - DTS_ADAPTIVE_OUTPUT_PER = BC_BIT(17), - DTS_INTELLIMAP = BC_BIT(18), - /* b[19]-b[21] : select clock frequency */ - DTS_PLAYBACK_DROP_RPT_MODE = BC_BIT(22), - DTS_DIAG_TEST_MODE = BC_BIT(23), - DTS_SINGLE_THREADED_MODE = BC_BIT(24), - DTS_FILTER_MODE = BC_BIT(25), - DTS_MFT_MODE = BC_BIT(26) -}; - -#define DTS_DFLT_RESOLUTION(x) (x<<11) - -#define DTS_DFLT_CLOCK(x) (x<<19) - -/* F/W File Version corresponding to S/W Releases */ -enum _FW_FILE_VER { - /* S/W release: 02.04.02 F/W release 2.12.2.0 */ - BC_FW_VER_020402 = ((12<<16) | (2<<8) | (0)) -}; - -/*------------------------------------------------------* - * Stream Types for DtsOpenDecoder() * - *------------------------------------------------------*/ -enum _DtsOpenDecStreamTypes { - BC_STREAM_TYPE_ES = 0, - BC_STREAM_TYPE_PES = 1, - BC_STREAM_TYPE_TS = 2, - BC_STREAM_TYPE_ES_TSTAMP = 6, -}; - -/*------------------------------------------------------* - * Video Algorithms for DtsSetVideoParams() * - *------------------------------------------------------*/ -enum _DtsSetVideoParamsAlgo { - BC_VID_ALGO_H264 = 0, - BC_VID_ALGO_MPEG2 = 1, - BC_VID_ALGO_VC1 = 4, - BC_VID_ALGO_DIVX = 6, - BC_VID_ALGO_VC1MP = 7, -}; - -/*------------------------------------------------------* - * MPEG Extension to the PPB * - *------------------------------------------------------*/ -#define BC_MPEG_VALID_PANSCAN (1) - -typedef struct _BC_PIB_EXT_MPEG { - uint32_t valid; - /* Always valid, defaults to picture size if no - * sequence display extension in the stream. */ - uint32_t display_horizontal_size; - uint32_t display_vertical_size; - - /* MPEG_VALID_PANSCAN - * Offsets are a copy values from the MPEG stream. */ - uint32_t offset_count; - int32_t horizontal_offset[3]; - int32_t vertical_offset[3]; - -} BC_PIB_EXT_MPEG; - -/*------------------------------------------------------* - * H.264 Extension to the PPB * - *------------------------------------------------------*/ -/* Bit definitions for 'other.h264.valid' field */ -#define H264_VALID_PANSCAN (1) -#define H264_VALID_SPS_CROP (2) -#define H264_VALID_VUI (4) - -typedef struct _BC_PIB_EXT_H264 { - /* 'valid' specifies which fields (or sets of - * fields) below are valid. If the corresponding - * bit in 'valid' is NOT set then that field(s) - * is (are) not initialized. */ - uint32_t valid; - - /* H264_VALID_PANSCAN */ - uint32_t pan_scan_count; - int32_t pan_scan_left[3]; - int32_t pan_scan_right[3]; - int32_t pan_scan_top[3]; - int32_t pan_scan_bottom[3]; - - /* H264_VALID_SPS_CROP */ - int32_t sps_crop_left; - int32_t sps_crop_right; - int32_t sps_crop_top; - int32_t sps_crop_bottom; - - /* H264_VALID_VUI */ - uint32_t chroma_top; - uint32_t chroma_bottom; - -} BC_PIB_EXT_H264; - -/*------------------------------------------------------* - * VC1 Extension to the PPB * - *------------------------------------------------------*/ -#define VC1_VALID_PANSCAN (1) - -typedef struct _BC_PIB_EXT_VC1 { - uint32_t valid; - - /* Always valid, defaults to picture size if no - * sequence display extension in the stream. */ - uint32_t display_horizontal_size; - uint32_t display_vertical_size; - - /* VC1 pan scan windows */ - uint32_t num_panscan_windows; - int32_t ps_horiz_offset[4]; - int32_t ps_vert_offset[4]; - int32_t ps_width[4]; - int32_t ps_height[4]; - -} BC_PIB_EXT_VC1; - - -/*------------------------------------------------------* - * Picture Information Block * - *------------------------------------------------------*/ -#if defined(__LINUX_USER__) -/* Values for 'pulldown' field. '0' means no pulldown information - * was present for this picture. */ -enum { - vdecNoPulldownInfo = 0, - vdecTop = 1, - vdecBottom = 2, - vdecTopBottom = 3, - vdecBottomTop = 4, - vdecTopBottomTop = 5, - vdecBottomTopBottom = 6, - vdecFrame_X2 = 7, - vdecFrame_X3 = 8, - vdecFrame_X1 = 9, - vdecFrame_X4 = 10, -}; - -/* Values for the 'frame_rate' field. */ -enum { - vdecFrameRateUnknown = 0, - vdecFrameRate23_97, - vdecFrameRate24, - vdecFrameRate25, - vdecFrameRate29_97, - vdecFrameRate30, - vdecFrameRate50, - vdecFrameRate59_94, - vdecFrameRate60, - vdecFrameRate14_985, - vdecFrameRate7_496, -}; - -/* Values for the 'aspect_ratio' field. */ -enum { - vdecAspectRatioUnknown = 0, - vdecAspectRatioSquare, - vdecAspectRatio12_11, - vdecAspectRatio10_11, - vdecAspectRatio16_11, - vdecAspectRatio40_33, - vdecAspectRatio24_11, - vdecAspectRatio20_11, - vdecAspectRatio32_11, - vdecAspectRatio80_33, - vdecAspectRatio18_11, - vdecAspectRatio15_11, - vdecAspectRatio64_33, - vdecAspectRatio160_99, - vdecAspectRatio4_3, - vdecAspectRatio16_9, - vdecAspectRatio221_1, - vdecAspectRatioOther = 255, -}; - -/* Values for the 'colour_primaries' field. */ -enum { - vdecColourPrimariesUnknown = 0, - vdecColourPrimariesBT709, - vdecColourPrimariesUnspecified, - vdecColourPrimariesReserved, - vdecColourPrimariesBT470_2M = 4, - vdecColourPrimariesBT470_2BG, - vdecColourPrimariesSMPTE170M, - vdecColourPrimariesSMPTE240M, - vdecColourPrimariesGenericFilm, -}; - -enum { - vdecRESOLUTION_CUSTOM = 0x00000000, /* custom */ - vdecRESOLUTION_480i = 0x00000001, /* 480i */ - vdecRESOLUTION_1080i = 0x00000002, /* 1080i (1920x1080, 60i) */ - vdecRESOLUTION_NTSC = 0x00000003, /* NTSC (720x483, 60i) */ - vdecRESOLUTION_480p = 0x00000004, /* 480p (720x480, 60p) */ - vdecRESOLUTION_720p = 0x00000005, /* 720p (1280x720, 60p) */ - vdecRESOLUTION_PAL1 = 0x00000006, /* PAL_1 (720x576, 50i) */ - vdecRESOLUTION_1080i25 = 0x00000007, /* 1080i25 (1920x1080, 50i) */ - vdecRESOLUTION_720p50 = 0x00000008, /* 720p50 (1280x720, 50p) */ - vdecRESOLUTION_576p = 0x00000009, /* 576p (720x576, 50p) */ - vdecRESOLUTION_1080i29_97 = 0x0000000A, /* 1080i (1920x1080, 59.94i) */ - vdecRESOLUTION_720p59_94 = 0x0000000B, /* 720p (1280x720, 59.94p) */ - vdecRESOLUTION_SD_DVD = 0x0000000C, /* SD DVD (720x483, 60i) */ - vdecRESOLUTION_480p656 = 0x0000000D, /* 480p (720x480, 60p), output bus width 8 bit, clock 74.25MHz */ - vdecRESOLUTION_1080p23_976 = 0x0000000E, /* 1080p23_976 (1920x1080, 23.976p) */ - vdecRESOLUTION_720p23_976 = 0x0000000F, /* 720p23_976 (1280x720p, 23.976p) */ - vdecRESOLUTION_240p29_97 = 0x00000010, /* 240p (1440x240, 29.97p ) */ - vdecRESOLUTION_240p30 = 0x00000011, /* 240p (1440x240, 30p) */ - vdecRESOLUTION_288p25 = 0x00000012, /* 288p (1440x288p, 25p) */ - vdecRESOLUTION_1080p29_97 = 0x00000013, /* 1080p29_97 (1920x1080, 29.97p) */ - vdecRESOLUTION_1080p30 = 0x00000014, /* 1080p30 (1920x1080, 30p) */ - vdecRESOLUTION_1080p24 = 0x00000015, /* 1080p24 (1920x1080, 24p) */ - vdecRESOLUTION_1080p25 = 0x00000016, /* 1080p25 (1920x1080, 25p) */ - vdecRESOLUTION_720p24 = 0x00000017, /* 720p24 (1280x720, 25p) */ - vdecRESOLUTION_720p29_97 = 0x00000018, /* 720p29.97 (1280x720, 29.97p) */ - vdecRESOLUTION_480p23_976 = 0x00000019, /* 480p23.976 (720*480, 23.976) */ - vdecRESOLUTION_480p29_97 = 0x0000001A, /* 480p29.976 (720*480, 29.97p) */ - vdecRESOLUTION_576p25 = 0x0000001B, /* 576p25 (720*576, 25p) */ - /* For Zero Frame Rate */ - vdecRESOLUTION_480p0 = 0x0000001C, /* 480p (720x480, 0p) */ - vdecRESOLUTION_480i0 = 0x0000001D, /* 480i (720x480, 0i) */ - vdecRESOLUTION_576p0 = 0x0000001E, /* 576p (720x576, 0p) */ - vdecRESOLUTION_720p0 = 0x0000001F, /* 720p (1280x720, 0p) */ - vdecRESOLUTION_1080p0 = 0x00000020, /* 1080p (1920x1080, 0p) */ - vdecRESOLUTION_1080i0 = 0x00000021, /* 1080i (1920x1080, 0i) */ -}; - -/* Bit definitions for 'flags' field */ -#define VDEC_FLAG_EOS (0x0004) - -#define VDEC_FLAG_FRAME (0x0000) -#define VDEC_FLAG_FIELDPAIR (0x0008) -#define VDEC_FLAG_TOPFIELD (0x0010) -#define VDEC_FLAG_BOTTOMFIELD (0x0018) - -#define VDEC_FLAG_PROGRESSIVE_SRC (0x0000) -#define VDEC_FLAG_INTERLACED_SRC (0x0020) -#define VDEC_FLAG_UNKNOWN_SRC (0x0040) - -#define VDEC_FLAG_BOTTOM_FIRST (0x0080) -#define VDEC_FLAG_LAST_PICTURE (0x0100) - -#define VDEC_FLAG_PICTURE_META_DATA_PRESENT (0x40000) - -#endif /* __LINUX_USER__ */ - -typedef struct _BC_PIC_INFO_BLOCK { - /* Common fields. */ - uint64_t timeStamp; /* Timestamp */ - uint32_t picture_number; /* Ordinal display number */ - uint32_t width; /* pixels */ - uint32_t height; /* pixels */ - uint32_t chroma_format; /* 0x420, 0x422 or 0x444 */ - uint32_t pulldown; - uint32_t flags; - uint32_t frame_rate; - uint32_t aspect_ratio; - uint32_t colour_primaries; - uint32_t picture_meta_payload; - uint32_t sess_num; - uint32_t ycom; - uint32_t custom_aspect_ratio_width_height; - uint32_t n_drop; /* number of non-reference frames remaining to be dropped */ - - /* Protocol-specific extensions. */ - union { - BC_PIB_EXT_H264 h264; - BC_PIB_EXT_MPEG mpeg; - BC_PIB_EXT_VC1 vc1; - } other; - -} BC_PIC_INFO_BLOCK, *PBC_PIC_INFO_BLOCK; - -/*------------------------------------------------------* - * ProcOut Info * - *------------------------------------------------------*/ -/* Optional flags for ProcOut Interface.*/ -enum _POUT_OPTIONAL_IN_FLAGS_{ - /* Flags from App to Device */ - BC_POUT_FLAGS_YV12 = 0x01, /* Copy Data in YV12 format */ - BC_POUT_FLAGS_STRIDE = 0x02, /* Stride size is valid. */ - BC_POUT_FLAGS_SIZE = 0x04, /* Take size information from Application */ - BC_POUT_FLAGS_INTERLACED = 0x08, /* copy only half the bytes */ - BC_POUT_FLAGS_INTERLEAVED = 0x10, /* interleaved frame */ - BC_POUT_FLAGS_STRIDE_UV = 0x20, /* Stride size is valid (for UV buffers). */ - BC_POUT_FLAGS_MODE = 0x40, /* Take output mode from Application, overrides YV12 flag if on */ - - /* Flags from Device to APP */ - BC_POUT_FLAGS_FMT_CHANGE = 0x10000, /* Data is not VALID when this flag is set */ - BC_POUT_FLAGS_PIB_VALID = 0x20000, /* PIB Information valid */ - BC_POUT_FLAGS_ENCRYPTED = 0x40000, /* Data is encrypted. */ - BC_POUT_FLAGS_FLD_BOT = 0x80000, /* Bottom Field data */ -}; - -//Decoder Capability -enum DECODER_CAP_FLAGS -{ - BC_DEC_FLAGS_H264 = 0x01, - BC_DEC_FLAGS_MPEG2 = 0x02, - BC_DEC_FLAGS_VC1 = 0x04, - BC_DEC_FLAGS_M4P2 = 0x08, //MPEG-4 Part 2: Divx, Xvid etc. -}; - -#if defined(__KERNEL__) || defined(__LINUX_USER__) -typedef BC_STATUS(*dts_pout_callback)(void *shnd, uint32_t width, uint32_t height, uint32_t stride, void *pOut); -#else -typedef BC_STATUS(*dts_pout_callback)(void *shnd, uint32_t width, uint32_t height, uint32_t stride, struct _BC_DTS_PROC_OUT *pOut); -#endif - -/* Line 21 Closed Caption */ -/* User Data */ -#define MAX_UD_SIZE 1792 /* 1920 - 128 */ - -typedef struct _BC_DTS_PROC_OUT { - uint8_t *Ybuff; /* Caller Supplied buffer for Y data */ - uint32_t YbuffSz; /* Caller Supplied Y buffer size */ - uint32_t YBuffDoneSz; /* Transferred Y datasize */ - - uint8_t *UVbuff; /* Caller Supplied buffer for UV data */ - uint32_t UVbuffSz; /* Caller Supplied UV buffer size */ - uint32_t UVBuffDoneSz; /* Transferred UV data size */ - - uint32_t StrideSz; /* Caller supplied Stride Size */ - uint32_t PoutFlags; /* Call IN Flags */ - - uint32_t discCnt; /* Picture discontinuity count */ - - BC_PIC_INFO_BLOCK PicInfo; /* Picture Information Block Data */ - - /* Line 21 Closed Caption */ - /* User Data */ - uint32_t UserDataSz; - uint8_t UserData[MAX_UD_SIZE]; - - void *hnd; - dts_pout_callback AppCallBack; - uint8_t DropFrames; - uint8_t b422Mode; /* Picture output Mode */ - uint8_t bPibEnc; /* PIB encrypted */ - uint8_t bRevertScramble; - uint32_t StrideSzUV; /* Caller supplied Stride Size */ - -} BC_DTS_PROC_OUT; - -typedef struct _BC_DTS_STATUS { - uint8_t ReadyListCount; /* Number of frames in ready list (reported by driver) */ - uint8_t FreeListCount; /* Number of frame buffers free. (reported by driver) */ - uint8_t PowerStateChange; /* Number of active state power transitions (reported by driver) */ - uint8_t reserved_[1]; - - uint32_t FramesDropped; /* Number of frames dropped. (reported by DIL) */ - uint32_t FramesCaptured; /* Number of frames captured. (reported by DIL) */ - uint32_t FramesRepeated; /* Number of frames repeated. (reported by DIL) */ - - uint32_t InputCount; /* Times compressed video has been sent to the HW. - * i.e. Successful DtsProcInput() calls (reported by DIL) */ - uint64_t InputTotalSize; /* Amount of compressed video that has been sent to the HW. - * (reported by DIL) */ - uint32_t InputBusyCount; /* Times compressed video has attempted to be sent to the HW - * but the input FIFO was full. (reported by DIL) */ - - uint32_t PIBMissCount; /* Amount of times a PIB is invalid. (reported by DIL) */ - - uint32_t cpbEmptySize; /* supported only for H.264, specifically changed for - * SingleThreadedAppMode. Report size of CPB buffer available. - * Reported by DIL */ - uint64_t NextTimeStamp; /* TimeStamp of the next picture that will be returned - * by a call to ProcOutput. Added for SingleThreadedAppMode. - * Reported back from the driver */ - uint8_t TxBufData; - - uint8_t reserved__[3]; - - uint32_t picNumFlags; /* Picture number and flags of the next picture to be delivered from the driver */ - - uint8_t reserved___[8]; - -} BC_DTS_STATUS; - -#define BC_SWAP32(_v) \ - ((((_v) & 0xFF000000)>>24)| \ - (((_v) & 0x00FF0000)>>8)| \ - (((_v) & 0x0000FF00)<<8)| \ - (((_v) & 0x000000FF)<<24)) - -#define WM_AGENT_TRAYICON_DECODER_OPEN 10001 -#define WM_AGENT_TRAYICON_DECODER_CLOSE 10002 -#define WM_AGENT_TRAYICON_DECODER_START 10003 -#define WM_AGENT_TRAYICON_DECODER_STOP 10004 -#define WM_AGENT_TRAYICON_DECODER_RUN 10005 -#define WM_AGENT_TRAYICON_DECODER_PAUSE 10006 - -#define MAX_COLOR_SPACES 3 - -typedef enum _BC_OUTPUT_FORMAT { - MODE420 = 0x0, - MODE422_YUY2 = 0x1, - MODE422_UYVY = 0x2, - OUTPUT_MODE420 = 0x0, - OUTPUT_MODE422_YUY2 = 0x1, - OUTPUT_MODE422_UYVY = 0x2, - OUTPUT_MODE420_NV12 = 0x0, - OUTPUT_MODE_INVALID = 0xFF, -} BC_OUTPUT_FORMAT; - -typedef struct _BC_COLOR_SPACES_ { - BC_OUTPUT_FORMAT OutFmt[MAX_COLOR_SPACES]; - uint16_t Count; -} BC_COLOR_SPACES; - - -typedef enum _BC_CAPS_FLAGS_ { - PES_CONV_SUPPORT = 1, /*Support PES Conversion*/ - MULTIPLE_DECODE_SUPPORT = 2 /*Support multiple stream decode*/ -} BC_CAPS_FLAGS; - -typedef struct _BC_HW_CAPABILITY_ { - BC_CAPS_FLAGS flags; - BC_COLOR_SPACES ColorCaps; - void* Reserved1; /* Expansion Of API */ - - //Decoder Capability - uint32_t DecCaps; //DECODER_CAP_FLAGS -} BC_HW_CAPS, *PBC_HW_CAPS; - -typedef struct _BC_SCALING_PARAMS_ { - uint32_t sWidth; - uint32_t sHeight; - uint32_t DNR; - uint32_t Reserved1; /*Expansion Of API*/ - uint8_t *Reserved2; /*Expansion OF API*/ - uint32_t Reserved3; /*Expansion Of API*/ - uint8_t *Reserved4; /*Expansion Of API*/ - -} BC_SCALING_PARAMS, *PBC_SCALING_PARAMS; - -typedef enum _BC_MEDIA_SUBTYPE_ { - BC_MSUBTYPE_INVALID = 0, - BC_MSUBTYPE_MPEG1VIDEO, - BC_MSUBTYPE_MPEG2VIDEO, - BC_MSUBTYPE_H264, - BC_MSUBTYPE_WVC1, - BC_MSUBTYPE_WMV3, - BC_MSUBTYPE_AVC1, - BC_MSUBTYPE_WMVA, - BC_MSUBTYPE_VC1, - BC_MSUBTYPE_DIVX, - BC_MSUBTYPE_DIVX311, - BC_MSUBTYPE_OTHERS /*Types to facilitate PES conversion*/ -} BC_MEDIA_SUBTYPE; - -typedef struct _BC_INPUT_FORMAT_ { - BOOL FGTEnable; /*Enable processing of FGT SEI*/ - BOOL MetaDataEnable; /*Enable retrieval of picture metadata to be sent to video pipeline.*/ - BOOL Progressive; /*Instruct decoder to always try to send back progressive - frames. If input content is 1080p, the decoder will - ignore pull-down flags and always give 1080p output. - If 1080i content is processed, the decoder will return - 1080i data. When this flag is not set, the decoder will - use pull-down information in the input stream to decide - the decoded data format.*/ - uint32_t OptFlags; /*In this field bits 0:3 are used pass default frame rate, bits 4:5 are for operation mode - (used to indicate Blu-ray mode to the decoder) and bit 6 is for the flag mpcOutPutMaxFRate - which when set tells the FW to output at the max rate for the resolution and ignore the - frame rate determined from the stream. Bit 7 is set to indicate that this is single threaded - mode and the driver will be peeked to get timestamps ahead of time*/ - BC_MEDIA_SUBTYPE mSubtype; /* Video Media Type*/ - uint32_t width; - uint32_t height; - uint32_t startCodeSz; /*Start code size for H264 clips*/ - uint8_t *pMetaData; /*Metadata buffer that is used to pass sequence header*/ - uint32_t metaDataSz; /*Metadata size*/ - uint8_t bEnableScaling; - BC_SCALING_PARAMS ScalingParams; -} BC_INPUT_FORMAT; - -typedef struct _BC_INFO_CRYSTAL_ { - uint8_t device; - union { - struct { - uint32_t dilRelease:8; - uint32_t dilMajor:8; - uint32_t dilMinor:16; - }; - uint32_t version; - } dilVersion; - - union { - struct { - uint32_t drvRelease:4; - uint32_t drvMajor:8; - uint32_t drvMinor:12; - uint32_t drvBuild:8; - }; - uint32_t version; - } drvVersion; - - union { - struct { - uint32_t fwRelease:4; - uint32_t fwMajor:8; - uint32_t fwMinor:12; - uint32_t fwBuild:8; - }; - uint32_t version; - } fwVersion; - - uint32_t Reserved1; // For future expansion - uint32_t Reserved2; // For future expansion -} BC_INFO_CRYSTAL, *PBC_INFO_CRYSTAL; - -#endif /* _BC_DTS_DEFS_H_ */ diff --git a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/bc_dts_types.h b/tools/osx/osx-depends/libcrystalhd/libcrystalhd/bc_dts_types.h deleted file mode 100644 index a0b9ca52ad28f..0000000000000 --- a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/bc_dts_types.h +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************** - * Copyright(c) 2006-2009 Broadcom Corporation. - * - * Name: bc_dts_types.h - * - * Description: Data types - * - * AU - * - * HISTORY: - * - ******************************************************************** - * This header is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 2.1 of the License. - * - * This header 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 Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License - * along with this header. If not, see . - *******************************************************************/ - -#ifndef _BC_DTS_TYPES_H_ -#define _BC_DTS_TYPES_H_ - -#ifdef __LINUX_USER__ /* Don't include these for KERNEL.. */ -#include -#endif - -#ifndef PVOID -typedef void *PVOID; -#endif - -#ifndef BOOL -typedef int BOOL; -#endif - -#ifdef __LINUX_USER__ /* Don't include these for KERNEL */ -typedef uint32_t ULONG; -typedef int32_t LONG; -typedef void *HANDLE; -#ifndef VOID -typedef void VOID; -#endif -typedef void *LPVOID; -typedef uint32_t DWORD; -typedef uint32_t UINT32; -typedef uint32_t *LPDWORD; -typedef unsigned char *PUCHAR; - -#ifndef TRUE - #define TRUE 1 -#endif - -#ifndef FALSE - #define FALSE 0 -#endif - -#else /* !__LINUX_USER__ */ - -/* For Kernel usage.. */ -typedef bool bc_bool_t; -#endif /* __LINUX_USER__ */ - -#endif - diff --git a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/libcrystalhd_if.h b/tools/osx/osx-depends/libcrystalhd/libcrystalhd/libcrystalhd_if.h deleted file mode 100644 index 45fa7a63f8696..0000000000000 --- a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/libcrystalhd_if.h +++ /dev/null @@ -1,1515 +0,0 @@ -/***************************************************************************** - * Copyright(c) 2006-2009 Broadcom Corporation. - * - * Name: libcrystalhd_if.h - * - * Description: Device Interface Library API. - * - * AU - * - * HISTORY: - * - ***************************************************************************** - * - * This file is part of libcrystalhd. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 2.1 of the License. - * - * This library 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 Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - * - ****************************************************************************/ - -#ifndef _BCM_LDIL_IF_H_ -#define _BCM_LDIL_IF_H_ - -#include "bc_dts_defs.h" - -#define FLEA_MAX_TRICK_MODE_SPEED 6 - -#ifdef __cplusplus -extern "C" { -#endif - -/***************************************************************************** -****************************************************************************** - - Theory of operation - - - The Device Interface Library (DIL) allows application level code, such -as a DirectShow filter, to access the Broadcom CrystalHD decoder driver to -provide hardware decoding for MPEG-2, H.264 (AVC) and VC-1 streams. - - In the Microsoft DirectShow system, the overall system graph would look -like the following: - -+--------+ +---------------+ +---------------+ +--------------------+ -| Source |->| Demultiplexer |->| Audio decoder |->| DirectSound Device | -+--------+ +---------------+ +---------------+ +--------------------+ - | - | +-------------------------+ +----------------+ - +->| Broadcom decoder filter |->| Video Renderer | - +-------------------------+ +----------------+ - | | - +----------------+ - | Broadcom DIL | - +----------------+ - | | - +-----------------+ - | Broadcom Driver | - +-----------------+ - - From the view of the caller, the DIL will accept compressed video streams -and will output decoded video frames or fields to seperate Y and UV buffers. -The DIL is responsible solely for decoding video and has no responsibilities -for audio nor for rendering, as shown in the above diagram. Audio/video -sychronization is assisted by feeding the DIL with timestamps so that it -may pass those timestamps along with the decoded video. The timestamped -output video will then be presented at the appropriate time by the renderer. - -A minimal implementation would be: - - HANDLE hBRCMhandle; - uint8_t input_buffer[INPUT_SIZE]; - uint8_t y_output_buffer[WIDTH*HEIGHT]; - uint8_t uv_output_buffer[WIDTH*HEIGHT]; - BC_DTS_PROC_OUT sProcOutData = { fill in your values here }; - BC_PIC_INFO_BLOCK sPIB = { fill in your values here }; - - // Acquire handle for device. - DtsDeviceOpen(&hBRCMhandle, 0); - - // Elemental stream. - DtsOpenDecoder(hBRCMhandle, 0); - - // H.264, Enable FGT SEI, do not parse metadata, no forced progressive out - DtsSetVideoParams(hBRCMhandle,0,1,0,0,0); - - // Tell decoder to wait for input from host. (PC) - DtsStartDecoder(hBRCMhandle); - - // Input buffer address, input buffer size, no timestamp, Unencrypted - DtsProcInput(hBRCMhandle,input_buffer,sizeof(input_buffer),0,0); - - // Tell PC to wait for data from decoder. - DtsStartCapture(hBRCMhandle); - - // 16ms timeout, pass pointer to PIB then get the decoded picture. - DtsProcOutput(hBRCMhandle,16,&sPIB); - - // Stop the decoder. - DtsStopDecoder(hBRCMhandle); - - // Close the decoder - DtsCloseDecoder(hBRCMhandle); - - // Release handle for device. - DtsDeviceClose(hBRCMhandle); - -****************************************************************************** -*****************************************************************************/ - -#define DRVIFLIB_API - -/***************************************************************************** -Function name: - - DtsDeviceOpen - -Description: - - Opens a handle to the decoder device that will be used to address that - unique instance of the decoder for all subsequent operations. - - Must be called once when the application opens the decoder for use. - -Parameters: - - *hDevice Pointer to device handle that will be filled in after the - device is successfully opened. [OUTPUT] - - mode Controls the mode in which the device is opened. - Currently only mode 0 (normal playback) is supported. - All other values will return BC_STS_INV_ARG. - -Return: - - Returns BC_STS_SUCCESS or error codes as appropriate. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsDeviceOpen( - HANDLE *hDevice, - uint32_t mode - ); - -/***************************************************************************** - -Function name: - - DtsDeviceClose - -Description: - - Close the handle to the decoder device. - - Must be called once when the application closes the decoder after use. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen - -Return: - - Returns BC_STS_SUCCESS or error codes as appropriate. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsDeviceClose( - HANDLE hDevice - ); - -/***************************************************************************** - -Function name: - - DtsGetVersion - -Description: - - Get version information from the driver as well as API library. - Version numbers are maintained in .. format. - Example ?01.23.4567 - - The device must have been previously opened for this call to succeed. - The individual components of the revision number are available as follows: - - o Major (8 Bits) : Bit 31 ?24 - o Minor (8 Bits) : Bit 23 ?16 - o Revision (16 Bits) : Bits 15 ?Bit 0. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen - DrVer Device driver version - DilVer Driver interface library version - -Return: - The revision numbers from the currently loaded driver as well as the - driver interface API library. - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsGetVersion( - HANDLE hDevice, - uint32_t *DrVer, - uint32_t *DilVer - ); - -/***************************************************************************** - -Function name: - - DtsGetFWVersionFromFile - -Description: - - Get version information from the Firmware Bin file when FW is not running - Version numbers in FW are maintained in .. format. - the return value will be of the format: - (Major << 16) | (Minor<<8) | Spl_rev ?012345 - - The individual components of the revision number are available as follows: - - o Major (8 Bits) : Bit 24 ?16 - o Minor (8 Bits) : Bit 16 ?8 - o Revision (16 Bits) : Bits 8 ?0. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen - StreamVer Stream FW version - DecVer VDEC FW version - Rsvd Reserved for future use - -Return: - The Stream FW Version umbers from the FW bin file in the install directory - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsGetFWVersionFromFile( - HANDLE hDevice, - uint32_t *StreamVer, - uint32_t *DecVer, - char *fname - ); - -/***************************************************************************** - -Function name: - - DtsGetFWVersion - -Description: - - Get version information from the Firmware. The version information is obtained - from Bin file when the flag is not set. When the flag is set, a FW command is - issued to get the version numbers. - Version numbers in FW are maintained in .. format. - Version number will be returned in the following format - (Major << 16) | (Minor<<8) | Spl_rev ?012345 - - The individual components of the revision number are available as follows: - - o Major (8 Bits) : Bit 24 ?16 - o Minor (8 Bits) : Bit 16 ?8 - o Revision (16 Bits) : Bits 8 ?Bit 0. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen - StreamVer Stream FW version - DecVer VDEC FW version - HwVer Hardware version - Rsvd Reserved for future use - flag Reseved for future use - -Return: - The Stream FW Version number, VDEC FW version and Hwrev - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsGetFWVersion( - HANDLE hDevice, - uint32_t *StreamVer, - uint32_t *DecVer, - uint32_t *HwVer, - char *fname, - uint32_t flag - ); - - -/***************************************************************************** - -Function name: - - DtsOpenDecoder - -Description: - - Open the decoder for playback operations and sets appropriate parameters - for decode of input video data. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - StreamType Currently supported streams are: - Elementary Streams with no timestamp management (0) - Transport Streams (2) - Elementary Streams with timestamp management (6) - All other values will return BC_STS_INV_ARG. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsOpenDecoder( - HANDLE hDevice, - uint32_t StreamType - ); - -/***************************************************************************** - -Function name: - - DtsCloseDecoder - -Description: - - Close the decoder. No further pictures will be produced and all input - will be ignored. - - The device must have been previously opened for this call to succeed. - This function closes the decoder and cleans up the state of the driver - and the library. All pending pictures will be dropped and all outstanding - transfers to and from the decoder will be aborted. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsCloseDecoder( - HANDLE hDevice - ); - -/***************************************************************************** - -Function name: - - DtsStartDecoder - -Description: - - Start the actual processing of input data. Before this command the - decoder will ignore all of the presented input data. - - DtsOpenDecoder must always be followed by a DtsStartDecoder for the - decoder to start processing input data. The device must have been - previously opened for this call to succeed. In addition the video - parameters for codec must have been set via a call to DtsSetVideoParams. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsStartDecoder( - HANDLE hDevice - ); - - -/***************************************************************************** - -Function name: - - DtsSetVideoParams - -Description: - - Sets various codec parameters that would be used by a subsequent call - to DtsStartDecoder. - - DtsSetVideoParams must always be called before DtsStartDecoder for the - decoder to start processing input data. The device must have been - previously opened for this call to succeed. - -Parameters: - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - videoAlg Video Codec to be enabled to decode stream. - H.264 (0), VC-1 (4) and MPEG-2 (1) currently supported. - All other values will return BC_STS_INV_ARG - FGTEnable Enable processing of FGT SEI. - MetaDataEnable Enable retrieval of picture metadata to be sent to video - pipeline. - Progressive Instruct decoder to always try to send back progressive - frames. If input content is 1080p, the decoder will - ignore pull-down flags and always give 1080p output. - If 1080i content is processed, the decoder will return - 1080i data. When this flag is not set, the decoder will - use pull-down information in the input stream to decide - the decoded data format. - OptFlags In this field bits 0:3 are used pass default frame rate, - bits 4:5 are for operation mode (used to indicate Blu-ray - mode to the decoder) and bit 6 is for the flag mpcOutPutMaxFRate - which when set tells the FW to output at the max rate for the - resolution and ignore the frame rate determined from the - stream. Bit 7 is set to indicate that this is single threaded mode - and the driver will be peeked to get timestamps ahead of time. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetVideoParams( - HANDLE hDevice, - uint32_t videoAlg, - BOOL FGTEnable, - BOOL MetaDataEnable, - BOOL Progressive, - uint32_t OptFlags - ); - -/***************************************************************************** - -Function name: - - DtsSetInputFormat - -Description: - - Sets input video's various parameters that would be used by a subsequent call - to DtsStartDecoder. - - DtsSetInputFormat must always be called before DtsStartDecoder for the - decoder to start processing input data. The device must have been - previously opened for this call to succeed. - -Parameters: - hDevice Handle to device. This is obtained via a prior call to DtsDeviceOpen. - pInputFormat Pointer to the BC_INPUT_FORMAT data. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetInputFormat( - HANDLE hDevice, - BC_INPUT_FORMAT *pInputFormat - ); - -/***************************************************************************** - -Function name: - - DtsGetVideoParams - -Description: - - Returns various codec parameters that would be used by a subsequent call - to DtsStartDecoder. These parameters are either default values or were - set via a prior call to DtsSetVideoParams - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - *videoAlg See DtsSetVideoParams. [OUTPUT] - *FGTEnable See DtsSetVideoParams. [OUTPUT] - *MetaDataEnable See DtsSetVideoParams. [OUTPUT] - *Progressive See DtsSetVideoParams. [OUTPUT] - Reserved This field is reserved for possible future expansion. - Set to 0. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsGetVideoParams( - HANDLE hDevice, - uint32_t *videoAlg, - BOOL *FGTEnable, - BOOL *MetaDataEnable, - BOOL *Progressive, - uint32_t Reserved - ); - -/***************************************************************************** - -Function name: - - DtsFormatChange - -Description: - - Changes codec type and parameters. - - The device must have been previously opened for this call to succeed. - This function should be used only for mid-stream format changes. - DtsStartDecoder must have been called before for this function to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - videoAlg Video Codec to be enabled to decode stream. - H.264 (0), VC-1 (4) and MPEG-2 (1) currently supported. All - other values will return BC_STS_INV_ARG - FGTEnable Enable processing of FGT SEI. - Progressive Instruct decoder to always try to send back progressive - frames. If input content is 1080p, the decoder will ignore - pull-down flags and always give 1080p output. If 1080i - content is processed, the decoder will return 1080i data. - When this flag is not set, the decoder will use pull-down - information in the input stream to decide the decoded data - format. - Reserved This field is reserved for possible future expansion. - Set to 0. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsFormatChange( - HANDLE hDevice, - uint32_t videoAlg, - BOOL FGTEnable, - BOOL MetaDataEnable, - BOOL Progressive, - uint32_t Reserved - ); - -/***************************************************************************** - -Function name: - - DtsStopDecoder - -Description: - - Stop the decoder. - - The device must have been previously opened for this call to succeed. - This function will clean up any pending operations and stop the decoder. - Internal state is still maintained and the decoder can be restarted. - Any pending pictures will be dropped. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsStopDecoder( - HANDLE hDevice - ); - -/***************************************************************************** - -Function name: - - DtsPauseDecoder - -Description: - - Pause the decoder. The paused picture will be repeated by decoder. - - The device must have been previously opened for this call to succeed. - In addition the decoder must have been started as well. If the decoder - is open but not started, this function will return BC_STS_DEC_NOT_STARTED. - If the decoder has not been opened this function will return - BC_STS_DEC_NOT_OPEN. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsPauseDecoder( - HANDLE hDevice - ); - -/***************************************************************************** - -Function name: - - DtsResumeDecoder - -Description: - - Unpause the decoder from a previous paused condition. - - The device must have been previously opened for this call to succeed. - If the decoder was not paused previously, this function will return - without affecting the decoder with a BC_STS_SUCCESS status. If the - decoder is open but not started, this function will return - BC_STS_DEC_NOT_STARTED. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsResumeDecoder( - HANDLE hDevice - ); - -/***************************************************************************** - -Function name: - - DtsSetVideoPID - -Description: - - Sets the video PID in the input Transport Stream that the decoder - needs to process. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - PID PID value that decoder needs to process. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetVideoPID( - HANDLE hDevice, - uint32_t pid - ); - - -/***************************************************************************** - -Function name: - - StartCaptureImmidiate - -Description: - - Instruct the driver to start capturing decoded frames for output. - - The device must have been previously opened for this call to succeed. - This function must be called before the first call to DtsProcInput. - This function instructs the receive path in the driver to start waiting - for valid data to be presented from the decoder. - -Parameters: - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsStartCaptureImmidiate( - HANDLE hDevice, - uint32_t Reserved - ); - - -/***************************************************************************** - -Function name: - - StartCapture - -Description: - - Instruct the driver to start capturing decoded frames for output. - - The device must have been previously opened for this call to succeed. - This function must be called before the first call to DtsProcInput. - This function instructs the receive path in the driver to start waiting - for valid data to be presented from the decoder. - -Parameters: - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsStartCapture( - HANDLE hDevice - ); - -/***************************************************************************** - -Function name: - - FlushRxCapture - -Description: - - ***This function is deprecated and is for temporary use only.*** - - Flush the driverís queue of pictures and stops the capture process. These - functions will be replaced with automatic Stop (End of Sequence) detection. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsFlushRxCapture( - HANDLE hDevice, - BOOL bDiscardOnly - ); - -/***************************************************************************** - -Function name: - - DtsProcOutput - -Description: - - Returns one decoded picture to the caller. - - The device must have been previously opened for this call to succeed. - - == NOTE ==== - For PIB AND 100% output encryption/scrambling on Bcm LINK hardware - use ProcOutputNoCopy() Interace. This interface will not support - PIB encryption. - - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - milliSecWait Timeout parameter. DtsProcOutput will fail is no picture - is received in this time. - *pOut This is a pointer to the BC_DTS_PROC_OUT structure that is - allocated by the caller. The decoded picture is returned - in this structure. This structure is described in the - data structures section. The actual data buffer to be - filled with the decoded data is allocated by the caller. - Data is copied from the decoder to the buffers before this - function returns. [INPUT/OUTPUT] - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsProcOutput( - HANDLE hDevice, - uint32_t milliSecWait, - BC_DTS_PROC_OUT *pOut - ); - -/***************************************************************************** - -Function name: - - DtsProcOutputNoCopy - -Description: - - Returns one decoded picture to the caller. Functionality of this API() - is very similar to ProcOutPut() API. This API will not copy the video data - to caller's buffers but provides the source buffer pointers in pOut structure. - - This is more secure and preferred method for BCM's Link hardware. The actual - format conversion/copy routines are provided as part of the Filter/Security - layer source code. Using this method, all the clear data handling will be - done by bcmDFilter or bcmSec layers which are expected to be in Player's - tamper resistant area. - - == NOTE ==== - 1) DtsReleaseOutputBuffs() interface must be called to release the buffers - back to DIL if return Status is BC_STS_SUCCESS. - - 2) Only this interface supports PIB and full 100% output encryption/Scrambling. - - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - milliSecWait Timeout parameter. DtsProcOoutput will fail is no picture - is received in this time. - *pOut This is a pointer to the BC_DTS_PROC_OUT structure that is - allocated by the caller. The decoded picture is returned - in this structure. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsProcOutputNoCopy( - HANDLE hDevice, - uint32_t milliSecWait, - BC_DTS_PROC_OUT *pOut - ); - -/***************************************************************************** - -Function name: - - DtsReleaseOutputBuffs - -Description: - - Release Buffers acquired during ProcOutputNoCopy() interface. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - Reserved Reserved. Set to NULL. - - fChange FALSE. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsReleaseOutputBuffs( - HANDLE hDevice, - PVOID Reserved, - BOOL fChange - ); - - -/***************************************************************************** - -Function name: - - DtsProcInput - -Description: - - Sends compressed (coded) data to the decoder for processing. - - The device must have been previously opened for this call to succeed. - In addition, suitable keys must have been exchanged for decryption and - decode to be successful. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - pUserData Pointer to data buffer that holds the data to be transferred. - [INPUT] - sizeInBytes Size in Bytes of data available to be sent to the decoder for - processing. - Timestamp Optional timestamp information attached to the media sample - that is available in the buffer. If timestamp is present - (i.e. non-zero), then this will be reflected in the output - sample (picture) produced from the contents of this buffer. - Timestamp should be in units of 100 ns. - Encrypted Flag to indicate that the data transfer is not in the clear - and that the decoder needs to decrypt before it can decode - the data. Note that due to complexity, it is preferred that - the application writer uses the higher level - dts_pre_proc_input() call if encypted content will be sent. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsProcInput( - HANDLE hDevice, - uint8_t *pUserData, - uint32_t ulSizeInBytes, - uint64_t timeStamp, - BOOL encrypted - ); - -/***************************************************************************** - -Function name: - - DtsGetColorPrimaries - -Description: - - Returns color primaries information from the stream being processed. - - The device must have been previously opened for this call to succeed. - In addition at least one picture must have been successfully decoded and - returned back from the decoder. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - colorPrimaries Pointer to U32 to receive the color primaries information. - The values returned are described in the previous section - regarding the picture metadata. [OUTPUT] - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsGetColorPrimaries( - HANDLE hDevice, - uint32_t *colorPrimaries - ); - -/***************************************************************************** - -Function name: - - DtsFlushInput - -Description: - - Flushes the current channel and causes the decoder to stop accessing input - data. Based on the flush mode parameter, the channel will be flushed from - the current point in the input data or from the current processing point. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - Mode 0 Flush at the current input point. use to drain the - input FIFO . All the data that has been received will - be decoded. - 1 Flush at the current processing point. All the decoded - frames will be presented but no more data from the - input will be decoded. - 2 Flushes all the decoder buffers, input, decoded and - to be decoded. - 3 Cancels the pending TX Request from the DIL/driver - 4 Flushes all the decoder buffers, input, decoded and - to be decoded data. Also flushes the drivers buffers - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsFlushInput( - HANDLE hDevice, - uint32_t Mode - ); - -/***************************************************************************** - -Function name: - - DtsSetRateChange - -Description: - - Sets the decoder playback speed and direction of playback. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - rate Inverse of speed x 10000. - Examples: - 1/2x playback speed = 20000 - 1x playback speed = 10000 - 2x playback speed = 5000 - - direction Playback direction. - 0 Forward direction. - 1 Reverse direction. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetRateChange( - HANDLE hDevice, - uint32_t rate, - uint8_t direction - ); - - -//Set FF Rate for Catching Up -/***************************************************************************** - -Function name: - - DtsSetFFRate - -Description: - - Sets the decoder playback FF speed - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - rate Inverse of speed x 10000. - Examples: - 1/2x playback speed = 20000 - 1x playback speed = 10000 - 2x playback speed = 5000 - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetFFRate( - HANDLE hDevice, - uint32_t rate - ); - -/***************************************************************************** - -Function name: - - DtsSetSkipPictureMode - -Description: - - This command sets the decoder to only decode selected picture types. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - SkipMode 0 IPB, All pictures are decoded. - - 1 IP decoding, This mode skips all non reference pictures. - - 2 I decoding, This mode skips all P/B pictures and only decodes - I pictures. -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetSkipPictureMode( - HANDLE hDevice, - uint32_t SkipMode - ); - -/***************************************************************************** - -Function name: - - DtsSetIFrameTrickMode - -Description: - - This command sets the decoder to decode only I Frames for FF and FR. - - Use this API for I Frame only trick mode play back in either direction. The - application/Up stream filter determines the speed of the playback by - means of Skip on the input compressed data. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetIFrameTrickMode( - HANDLE hDevice - ); - -/***************************************************************************** - -Function name: - - DtsStepDecoder - -Description: - - This function forwards one frame. - - The device must have been opened must be in paused - state previously for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsStepDecoder( - HANDLE hDevice - ); - - -/***************************************************************************** - -Function name: - - DtsIs422Supported - -Description: - - This function returns whether 422 YUV mode is supported or not. - - The device must have been opened previously for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - bSupported 1 - 422 is supported - 0 - 422 is not supported. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsIs422Supported( - HANDLE hDevice, - uint8_t *bSupported - ); - -/***************************************************************************** - -Function name: - - DtsSetColorSpace - -Description: - - This function sets the output sample's color space. - - The device must have been opened previously and must support 422 mode for - this call to succeed. - - Use "DtsIs422Supported" to find whether 422 mode is supported. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - 422Mode Mode is defined by BC_OUTPUT_FORMAT as follows - - OUTPUT_MODE420 = 0x0, - OUTPUT_MODE422_YUY2 = 0x1, - OUTPUT_MODE422_UYVY = 0x2, - OUTPUT_MODE_INVALID = 0xFF - Valid values for this API are OUTPUT_MODE422_YUY2 and OUTPUT_MODE422_UYVY - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetColorSpace( - HANDLE hDevice, - BC_OUTPUT_FORMAT Mode422 - ); - -/***************************************************************************** - -Function name: - - DtsSet422Mode - -Description: - - This function sets the 422 mode to either YUY2 or UYVY. - - The device must have been opened previously and must support 422 mode for - this call to succeed. - - Use "DtsIs422Supported" to find whether 422 mode is supported. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - 422Mode 0 - set the YUV mode to YUY2 - 1 - set the YUV mode to UYVY - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSet422Mode( - HANDLE hDevice, - uint8_t Mode422 - ); - -/***************************************************************************** - -Function name: - - DtsGetDILPath - -Description: - - This is a helper function to return DIL's Path. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - DilPath Buffer to hold DIL path info upto 256 bytes. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ - -DRVIFLIB_API BC_STATUS -DtsGetDILPath( - HANDLE hDevice, - char *DilPath, - uint32_t size - ); - -/***************************************************************************** - -Function name: - - DtsDropPictures - -Description: - - This command sets the decoder to skip one or more non-reference (B) pictures - in the input data stream. This is used for when the audio is ahead of - video and the application needs to cause video to move ahead to catch up. - Reference pictures are not skipped. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - Pictures The number of non-reference pictures to drop. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsDropPictures( - HANDLE hDevice, - uint32_t Pictures - ); - -/***************************************************************************** - -Function name: - - DtsGetDriverStatus - -Description: - - This command returns various statistics related to the driver and DIL. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - *pStatus Pointer to BC_DTS_STATUS to receive driver status. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsGetDriverStatus( - HANDLE hDevice, - BC_DTS_STATUS *pStatus - ); - -/***************************************************************************** - -Function name: - - DtsGetCapabilities - -Description: - - This command returns output format support and hardware capabilities. - - The device must have been previously opened for this call to succeed. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - pCapsBuffer Pointer to BC_HW_CAPS to receive HW Output capabilities. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsGetCapabilities ( - HANDLE hDevice, - PBC_HW_CAPS pCapsBuffer - ); - -/***************************************************************************** - -Function name: - - DtsSetScaleParams - -Description: - - This command sets hardware scaling parameters. - -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - pScaleParams Pointer to BC_SCALING_PARAMS to set hardware scaling parameters. - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsSetScaleParams ( - HANDLE hDevice, - PBC_SCALING_PARAMS pScaleParams - ); - -/***************************************************************************** - -Function name: - - DtsIsEndOfStream - -Description: - - This command returns whether the end of stream(EOS) is reaching. -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - bEOS Pointer to uint8_t to indicate if EOS of not - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsIsEndOfStream( - HANDLE hDevice, - uint8_t* bEOS -); - -/***************************************************************************** - -Function name: - - DtsCrystalHDVersion - -Description: - - This API returns hw and sw version information for Crystal HD solutions -Parameters: - - hDevice Handle to device. This is obtained via a prior call to - DtsDeviceOpen. - - bCrystalInfo Pointer to structure to fill in with information - - device = 0 for BCM70012, 1 for BCM70015 - -Return: - - BC_STS_SUCCESS will be returned on successful completion. - -*****************************************************************************/ -DRVIFLIB_API BC_STATUS -DtsCrystalHDVersion( - HANDLE hDevice, - PBC_INFO_CRYSTAL bCrystalInfo -); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/libcrystalhd_version.h b/tools/osx/osx-depends/libcrystalhd/libcrystalhd/libcrystalhd_version.h deleted file mode 100644 index b640dac41a2dc..0000000000000 --- a/tools/osx/osx-depends/libcrystalhd/libcrystalhd/libcrystalhd_version.h +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************** - * Copyright(c) 2006-2009 Broadcom Corporation. - * - * Name: libcrystalhd_version.h - * - * Description: Version numbering for the driver use. - * - * AU - * - * HISTORY: - * - ******************************************************************** - * This header is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 2.1 of the License. - * - * This header 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 Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License - * along with this header. If not, see . - *******************************************************************/ - -#ifndef _BC_DTS_VERSION_LNX_ -#define _BC_DTS_VERSION_LNX_ -// -// The version format that we are adopting is -// MajorVersion.MinorVersion.Revision -// This will be the same for all the components. -// -// -#define STRINGIFY_VERSION(MAJ,MIN,REV) STRINGIFIED_VERSION(MAJ,MIN,REV) -#define STRINGIFIED_VERSION(MAJ,MIN,REV) #MAJ "." #MIN "." #REV - -#define STRINGIFY_VERSION_W(MAJ,MIN,REV) STRINGIFIED_VERSION_W(MAJ,MIN,REV) -#define STRINGIFIED_VERSION_W(MAJ,MIN,REV) #MAJ "." #MIN "." #REV - -// -// Product Version number is: -// x.y.z.a -// -// x = Major release. 1 = Dozer, 2 = Dozer + Link -// y = Minor release. Should increase +1 per "real" release. -// z = Branch release. 0 for main branch. This is +1 per branch release. -// a = Build number +1 per candidate release. Reset to 0 every "real" release. -// -// -// Enabling Check-In rules enforcement 08092007 -// -#define INVALID_VERSION 0xFFFF - -/*========================== Common For All Components =================================*/ -#define BRCM_MAJOR_VERSION 3 - -#define DRIVER_MAJOR_VERSION BRCM_MAJOR_VERSION -#define DRIVER_MINOR_VERSION 6 -#define DRIVER_REVISION 0 - -#define RC_FILE_VERSION STRINGIFY_VERSION(DRIVER_MAJOR_VERSION,DRIVER_MINOR_VERSION,DRIVER_REVISION) ".0" - -/*======================= Device Interface Library ========================*/ -#define DIL_MAJOR_VERSION BRCM_MAJOR_VERSION -#define DIL_MINOR_VERSION 6 -#define DIL_REVISION 0 - -#define DIL_RC_FILE_VERSION STRINGIFY_VERSION(DIL_MAJOR_VERSION,DIL_MINOR_VERSION,DIL_REVISION) - -/*========================== deconf utility ==============================*/ -#define DECONF_MAJOR_VERSION BRCM_MAJOR_VERSION -#define DECONF_MINOR_VERSION 9 -#define DECONF_REVISION 18 -#define DECONF_RC_FILE_VERSION STRINGIFY_VERSION(DIL_MAJOR_VERSION,DIL_MINOR_VERSION,DIL_REVISION) - -/*========================== Firmware ==============================*/ -#define FW_MAJOR_VERSION BRCM_MAJOR_VERSION -#define FW_MINOR_VERSION 60 -#define FW_REVISION 39 - -#endif diff --git a/tools/osx/osx-depends/libflac/Makefile b/tools/osx/osx-depends/libflac/Makefile deleted file mode 100644 index b50b6db35adb2..0000000000000 --- a/tools/osx/osx-depends/libflac/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=flac -VERSION=1.2.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --disable-asm-optimizations \ - --disable-xmms-plugin \ - --disable-cpplibs - -LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libgcrypt/Makefile b/tools/osx/osx-depends/libgcrypt/Makefile deleted file mode 100644 index 41b30f30b8fab..0000000000000 --- a/tools/osx/osx-depends/libgcrypt/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libgcrypt -VERSION=1.4.0 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/libgcrypt.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); autoreconf -vif - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/osx-depends/libgpg-error/Makefile b/tools/osx/osx-depends/libgpg-error/Makefile deleted file mode 100644 index 8dc32d197b915..0000000000000 --- a/tools/osx/osx-depends/libgpg-error/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libgpg-error -VERSION=1.10 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --with-libintl-prefix=$(PREFIX)/lib - -LIBDYLIB=$(SOURCE)/.libs/libgpg-error.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/osx-depends/liblzo/01-liblzo-only-build-lib.patch b/tools/osx/osx-depends/liblzo/01-liblzo-only-build-lib.patch deleted file mode 100644 index 5df71ee48ab95..0000000000000 --- a/tools/osx/osx-depends/liblzo/01-liblzo-only-build-lib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN lzo-1.08.org/Makefile.am lzo-1.08/Makefile.am ---- lzo-1.08.org/Makefile.am 2002-07-12 21:31:52.000000000 -0400 -+++ lzo-1.08/Makefile.am 2010-10-29 12:13:48.000000000 -0400 -@@ -5,7 +5,7 @@ - - AUTOMAKE_OPTIONS = 1.6 gnu - --SUBDIRS = include src ltest examples tests minilzo -+SUBDIRS = include src - - EXTRA_DIST = BUGS - -diff -ruN lzo-1.08.org/Makefile.in lzo-1.08/Makefile.in ---- lzo-1.08.org/Makefile.in 2002-07-12 21:31:52.000000000 -0400 -+++ lzo-1.08/Makefile.in 2010-10-29 12:17:18.000000000 -0400 -@@ -108,7 +108,7 @@ - - AUTOMAKE_OPTIONS = 1.6 gnu - --SUBDIRS = include src ltest examples tests minilzo -+SUBDIRS = include src - - EXTRA_DIST = BUGS - - diff --git a/tools/osx/osx-depends/liblzo/Makefile b/tools/osx/osx-depends/liblzo/Makefile deleted file mode 100644 index 9d21c2ee18726..0000000000000 --- a/tools/osx/osx-depends/liblzo/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=lzo -VERSION=1.08 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-liblzo-only-build-lib.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/liblzo2/01-liblzo2-only-build-lib.patch b/tools/osx/osx-depends/liblzo2/01-liblzo2-only-build-lib.patch deleted file mode 100644 index f3d59609328ed..0000000000000 --- a/tools/osx/osx-depends/liblzo2/01-liblzo2-only-build-lib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN lzo-2.03.org/Makefile.am lzo-2.03/Makefile.am ---- lzo-2.03.org/Makefile.am 2008-04-30 08:51:49.000000000 -0400 -+++ lzo-2.03/Makefile.am 2010-10-29 12:38:51.000000000 -0400 -@@ -5,7 +5,7 @@ - - AUTOMAKE_OPTIONS = 1.9.6 gnu - --SUBDIRS = include src lzotest examples tests minilzo -+SUBDIRS = include src - - EXTRA_DIST = BUGS - -diff -ruN lzo-2.03.org/Makefile.in lzo-2.03/Makefile.in ---- lzo-2.03.org/Makefile.in 2008-04-30 08:51:49.000000000 -0400 -+++ lzo-2.03/Makefile.in 2010-10-29 12:56:42.000000000 -0400 -@@ -193,7 +193,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = 1.9.6 gnu --SUBDIRS = include src lzotest examples tests minilzo -+SUBDIRS = include src - EXTRA_DIST = BUGS - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - diff --git a/tools/osx/osx-depends/liblzo2/Makefile b/tools/osx/osx-depends/liblzo2/Makefile deleted file mode 100644 index c1140fa13cc7b..0000000000000 --- a/tools/osx/osx-depends/liblzo2/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=lzo -VERSION=2.03 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME)2.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-liblzo2-only-build-lib.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libmad/01-libmad-pkgconfig.patch b/tools/osx/osx-depends/libmad/01-libmad-pkgconfig.patch deleted file mode 100644 index 0ac88acb8415d..0000000000000 --- a/tools/osx/osx-depends/libmad/01-libmad-pkgconfig.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am ---- libmad-0.15.1b.orig/Makefile.am 2004-02-17 02:02:03.000000000 +0000 -+++ libmad-0.15.1b/Makefile.am 2005-08-25 12:08:04.000000000 +0000 -@@ -33,9 +33,12 @@ - minimad_INCLUDES = - minimad_LDADD = libmad.la - --EXTRA_DIST = mad.h.sed \ -+EXTRA_DIST = mad.h.sed mad.pc.in \ - CHANGES COPYRIGHT CREDITS README TODO VERSION - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA= mad.pc -+ - exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ - synth.h decoder.h - -diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in ---- libmad-0.15.1b.orig/Makefile.in 2004-02-17 02:33:23.000000000 +0000 -+++ libmad-0.15.1b/Makefile.in 2005-08-25 12:09:34.000000000 +0000 -@@ -14,6 +14,8 @@ - - @SET_MAKE@ - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = mad.pc - - SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES) - -@@ -43,7 +45,7 @@ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(srcdir)/libmad.list.in \ - $(top_srcdir)/configure COPYING INSTALL TODO config.guess \ -- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs -+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac -@@ -53,7 +55,7 @@ - configure.lineno configure.status.lineno - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = libmad.list -+CONFIG_CLEAN_FILES = libmad.list mad.pc - am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -218,7 +220,7 @@ - minimad_SOURCES = minimad.c - minimad_INCLUDES = - minimad_LDADD = libmad.la --EXTRA_DIST = mad.h.sed \ -+EXTRA_DIST = mad.h.sed mad.pc.in \ - CHANGES COPYRIGHT CREDITS README TODO VERSION - - exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ -@@ -298,6 +300,28 @@ - rm -f stamp-h1 - touch $@ - -+mad.pc: $(top_builddir)/config.status mad.pc.in -+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+install-pkgconfigDATA: $(pkgconfig_DATA) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) -+ @list='$(pkgconfig_DATA)'; for p in $$list; do \ -+ if test -f $(srcdir)/$$p; then \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ -+ else if test -f $$p; then \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ -+ fi; fi; \ -+ done -+ -+uninstall-pkgconfigDATA: -+ @$(NORMAL_UNINSTALL) -+ list='$(pkgconfig_DATA)'; for p in $$list; do \ -+ rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ -+ done -+ - distclean-hdr: - -rm -f config.h stamp-h1 - libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in -@@ -726,7 +750,7 @@ - - info-am: - --install-data-am: install-includeHEADERS -+install-data-am: install-includeHEADERS install-pkgconfigDATA - - install-exec-am: install-libLTLIBRARIES - -@@ -757,7 +781,7 @@ - ps-am: - - uninstall-am: uninstall-includeHEADERS uninstall-info-am \ -- uninstall-libLTLIBRARIES -+ uninstall-libLTLIBRARIES install-pkgconfigDATA - - uninstall-info: uninstall-info-recursive - -diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in ---- libmad-0.15.1b.orig/mad.pc.in 1970-01-01 00:00:00.000000000 +0000 -+++ libmad-0.15.1b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: MAD -+Description: libmad - MPEG audio decoder library -+Version: @VERSION@ -+Libs: -L${libdir} -lmad -+Cflags: diff --git a/tools/osx/osx-depends/libmad/Makefile b/tools/osx/osx-depends/libmad/Makefile deleted file mode 100644 index f122e0f610188..0000000000000 --- a/tools/osx/osx-depends/libmad/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmad -VERSION=0.15.1b -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --enable-fpm=default - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-libmad-pkgconfig.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libmicrohttpd/Makefile b/tools/osx/osx-depends/libmicrohttpd/Makefile deleted file mode 100644 index 97d1bda92e735..0000000000000 --- a/tools/osx/osx-depends/libmicrohttpd/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmicrohttpd -VERSION=0.4.6 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs - -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --with-libgcrypt-prefix=/dev/null - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libmodplug/Makefile b/tools/osx/osx-depends/libmodplug/Makefile deleted file mode 100644 index 78cd79a5641ec..0000000000000 --- a/tools/osx/osx-depends/libmodplug/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmodplug -VERSION=0.8.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs - -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libmpeg2/01-libmpeg2-add-asm-leading-underscores.patch b/tools/osx/osx-depends/libmpeg2/01-libmpeg2-add-asm-leading-underscores.patch deleted file mode 100644 index 532e53af4e584..0000000000000 --- a/tools/osx/osx-depends/libmpeg2/01-libmpeg2-add-asm-leading-underscores.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ruN libmpeg2-0.5.1.org/libmpeg2/motion_comp_arm_s.S libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S ---- libmpeg2-0.5.1.org/libmpeg2/motion_comp_arm_s.S 2008-07-09 15:16:05.000000000 -0400 -+++ libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S 2010-10-29 13:33:02.000000000 -0400 -@@ -23,8 +23,8 @@ - - @ ---------------------------------------------------------------- - .align -- .global MC_put_o_16_arm --MC_put_o_16_arm: -+ .global _MC_put_o_16_arm -+_MC_put_o_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11, lr} @ R14 is also called LR -@@ -83,8 +83,8 @@ - - @ ---------------------------------------------------------------- - .align -- .global MC_put_o_8_arm --MC_put_o_8_arm: -+ .global _MC_put_o_8_arm -+_MC_put_o_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r10, lr} @ R14 is also called LR -@@ -152,8 +152,8 @@ - .endm - - .align -- .global MC_put_x_16_arm --MC_put_x_16_arm: -+ .global _MC_put_x_16_arm -+_MC_put_x_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11,lr} @ R14 is also called LR -@@ -244,8 +244,8 @@ - - @ ---------------------------------------------------------------- - .align -- .global MC_put_x_8_arm --MC_put_x_8_arm: -+ .global _MC_put_x_8_arm -+_MC_put_x_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11,lr} @ R14 is also called LR - diff --git a/tools/osx/osx-depends/libmpeg2/02-neon.patch b/tools/osx/osx-depends/libmpeg2/02-neon.patch deleted file mode 100644 index 329551b65e07d..0000000000000 --- a/tools/osx/osx-depends/libmpeg2/02-neon.patch +++ /dev/null @@ -1,385 +0,0 @@ -Index: include/mpeg2.h -=================================================================== ---- include/mpeg2.h (révision 1193) -+++ include/mpeg2.h (copie de travail) -@@ -164,6 +164,7 @@ - #define MPEG2_ACCEL_SPARC_VIS 1 - #define MPEG2_ACCEL_SPARC_VIS2 2 - #define MPEG2_ACCEL_ARM 1 -+#define MPEG2_ACCEL_ARM_NEON 2 - #define MPEG2_ACCEL_DETECT 0x80000000 - - uint32_t mpeg2_accel (uint32_t accel); -Index: libmpeg2/motion_comp_neon.c -=================================================================== ---- libmpeg2/motion_comp_neon.c (révision 0) -+++ libmpeg2/motion_comp_neon.c (révision 0) -@@ -0,0 +1,302 @@ -+/* -+ * motion_comp_neon.c -+ * Copyright (C) 2009 Rémi Denis-Courmont -+ * -+ * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. -+ * See http://libmpeg2.sourceforge.net/ for updates. -+ * -+ * mpeg2dec 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. -+ * -+ * mpeg2dec 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 mpeg2dec; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#include "config.h" -+ -+#if defined(ARCH_ARM) -+ -+#include -+#include -+ -+#include "mpeg2.h" -+#include "attributes.h" -+#include "mpeg2_internal.h" -+ -+/* dest = ref */ -+static void MC_put_o_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ memcpy (dest, ref, 16); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_put_o_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ memcpy (dest, ref, 8); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+/* dest = (src1 + src2 + 1) / 2 */ -+static void MC_avg_1_16_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[src1]]\n" -+ "vld1.u8 {q1}, [%[src2]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0", "q1"); -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_1_8_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[src1]]\n" -+ "vld1.u8 {d1}, [%[src2]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0"); -+ -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+/* dest = (dest + ((src1 + src2 + 1) / 2) + 1) / 2 */ -+static void MC_avg_2_16_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[src1]]\n" -+ "vld1.u8 {q1}, [%[src2]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ "vld1.u8 {q2}, [%[dest]]\n" -+ /* XXX: one cycle stall */ -+ "vrhadd.u8 q0, q0, q2\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0", "q1", "q2"); -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_2_8_neon (uint8_t * dest, const uint8_t * src1, -+ const uint8_t * src2, -+ const int stride, unsigned height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[src1]]\n" -+ "vld1.u8 {d1}, [%[src2]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vld1.u8 {d2}, [%[dest]]\n" -+ "vrhadd.u8 d0, d0, d2\n" -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [src1]"r"(src1), [src2]"r"(src2) -+ : "memory", "q0", "d2"); -+ src1 += stride; -+ src2 += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_o_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_16_neon (dest, dest, ref, stride, height); -+} -+ -+static void MC_avg_o_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_8_neon (dest, dest, ref, stride, height); -+} -+ -+static void MC_put_x_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_16_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_put_x_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_8_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_avg_x_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_16_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_avg_x_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_8_neon (dest, ref, ref + 1, stride, height); -+} -+ -+static void MC_put_y_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_16_neon (dest, ref, ref + stride, stride, height); -+} -+static void MC_put_y_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_1_8_neon (dest, ref, ref + stride, stride, height); -+} -+ -+static void MC_avg_y_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_16_neon (dest, ref, ref + stride, stride, height); -+} -+ -+static void MC_avg_y_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ MC_avg_2_8_neon (dest, ref, ref + stride, stride, height); -+} -+ -+static void MC_put_xy_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[ref]]\n" -+ "vld1.u8 {q1}, [%[refx]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ "vld1.u8 {q2}, [%[refy]]\n" -+ "vld1.u8 {q3}, [%[refxy]]\n" -+ "vrhadd.u8 q2, q2, q3\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 q0, q0, q2\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1", "q2", "q3"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_put_xy_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[ref]]\n" -+ "vld1.u8 {d1}, [%[refx]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vld1.u8 {d2}, [%[refy]]\n" -+ "vld1.u8 {d3}, [%[refxy]]\n" -+ "vrhadd.u8 d2, d2, d3\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 d0, d0, d2\n" -+ /* XXX: three cycles stall */ -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_xy_16_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {q0}, [%[ref]]\n" -+ "vld1.u8 {q1}, [%[refx]]\n" -+ "vrhadd.u8 q0, q0, q1\n" -+ "vld1.u8 {q2}, [%[refy]]\n" -+ "vld1.u8 {q3}, [%[refxy]]\n" -+ "vrhadd.u8 q2, q2, q3\n" -+ "vld1.u8 {q4}, [%[dest]]\n" -+ /* XXX: one cycle stall */ -+ "vrhadd.u8 q0, q0, q2\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 q0, q4, q0\n" -+ "vst1.u8 {q0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1", "q2", "q3", "q4"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+static void MC_avg_xy_8_neon (uint8_t * dest, const uint8_t * ref, -+ const int stride, int height) -+{ -+ do { -+ asm volatile ( -+ "vld1.u8 {d0}, [%[ref]]\n" -+ "vld1.u8 {d1}, [%[refx]]\n" -+ "vrhadd.u8 d0, d0, d1\n" -+ "vld1.u8 {d2}, [%[refy]]\n" -+ "vld1.u8 {d3}, [%[refxy]]\n" -+ "vrhadd.u8 d2, d2, d3\n" -+ "vld1.u8 {d4}, [%[dest]]\n" -+ /* XXX: one cycle stall */ -+ "vrhadd.u8 d0, d0, d2\n" -+ /* XXX: three cycles stall */ -+ "vrhadd.u8 d0, d4, d0\n" -+ "vst1.u8 {d0}, [%[dest]]\n" -+ : -+ : [dest]"r"(dest), [ref]"r"(ref), [refx]"r"(ref + 1), -+ [refy]"r"(ref + stride), [refxy]"r"(ref + stride + 1) -+ : "memory", "q0", "q1", "d4"); -+ ref += stride; -+ dest += stride; -+ } while (--height); -+} -+ -+MPEG2_MC_EXTERN (neon) -+ -+#endif /* ARCH_ARM */ - -Modification de propriétés sur libmpeg2/motion_comp_neon.c -___________________________________________________________________ -Ajouté : svn:eol-style - + native - -Index: libmpeg2/mpeg2_internal.h -=================================================================== ---- libmpeg2/mpeg2_internal.h (révision 1193) -+++ libmpeg2/mpeg2_internal.h (copie de travail) -@@ -313,5 +313,6 @@ - extern mpeg2_mc_t mpeg2_mc_alpha; - extern mpeg2_mc_t mpeg2_mc_vis; - extern mpeg2_mc_t mpeg2_mc_arm; -+extern mpeg2_mc_t mpeg2_mc_neon; - - #endif /* LIBMPEG2_MPEG2_INTERNAL_H */ -Index: libmpeg2/motion_comp.c -=================================================================== ---- libmpeg2/motion_comp.c (révision 1193) -+++ libmpeg2/motion_comp.c (copie de travail) -@@ -58,6 +58,11 @@ - else - #endif - #ifdef ARCH_ARM -+#ifdef ARCH_ARM -+ if (accel & MPEG2_ACCEL_ARM) -+ mpeg2_mc = mpeg2_mc_neon; -+ else -+#endif - if (accel & MPEG2_ACCEL_ARM) { - mpeg2_mc = mpeg2_mc_arm; - } else -Index: libmpeg2/Makefile.am -=================================================================== ---- libmpeg2/Makefile.am (révision 1193) -+++ libmpeg2/Makefile.am (copie de travail) -@@ -14,7 +14,7 @@ - motion_comp_vis.c motion_comp_arm.c \ - cpu_accel.c cpu_state.c - if ARCH_ARM --libmpeg2arch_la_SOURCES += motion_comp_arm_s.S -+libmpeg2arch_la_SOURCES += motion_comp_arm_s.S motion_comp_neon.c - endif - libmpeg2arch_la_CFLAGS = $(OPT_CFLAGS) $(ARCH_OPT_CFLAGS) $(LIBMPEG2_CFLAGS) - -Index: configure.ac -=================================================================== ---- configure.ac (révision 1193) -+++ configure.ac (copie de travail) -@@ -103,7 +103,14 @@ - AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);; - arm*) - arm_conditional=: -- AC_DEFINE([ARCH_ARM],,[ARM architecture]);; -+ AC_DEFINE([ARCH_ARM],,[ARM architecture]) -+ AC_MSG_CHECKING([if inline ARM Advanced SIMD assembly is supported]) -+ AC_TRY_COMPILE([], -+ [asm ("vqmovun.s64 d0, q1":::"d0");], -+ [AC_DEFINE([ARCH_ARM_NEON],, [ARM Advanced SIMD assembly]) -+ AC_MSG_RESULT(yes)], -+ [AC_MSG_RESULT(no)]) -+ ;; - esac - elif test x"$CC" = x"tendracc"; then - dnl TenDRA portability checking compiler diff --git a/tools/osx/osx-depends/libmpeg2/03-config-fix.patch b/tools/osx/osx-depends/libmpeg2/03-config-fix.patch deleted file mode 100644 index 98f766ed6a3cf..0000000000000 --- a/tools/osx/osx-depends/libmpeg2/03-config-fix.patch +++ /dev/null @@ -1,208 +0,0 @@ ---- a/libmpeg2/Makefile.in 2011-01-29 10:17:27.000000000 +0100 -+++ b/libmpeg2/Makefile.in 2011-01-29 10:28:26.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -33,14 +33,17 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@ARCH_ARM_TRUE@am__append_1 = motion_comp_arm_s.S -+@ARCH_ARM_TRUE@am__append_1 = motion_comp_arm_s.S motion_comp_neon.c - subdir = libmpeg2 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/libmpeg2.pc.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/cflags.m4 \ - $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/keywords.m4 \ -- $(top_srcdir)/m4/nonpic.m4 $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ -+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ -+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nonpic.m4 \ -+ $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -66,8 +69,9 @@ - am__libmpeg2arch_la_SOURCES_DIST = motion_comp_mmx.c idct_mmx.c \ - motion_comp_altivec.c idct_altivec.c motion_comp_alpha.c \ - idct_alpha.c motion_comp_vis.c motion_comp_arm.c cpu_accel.c \ -- cpu_state.c motion_comp_arm_s.S --@ARCH_ARM_TRUE@am__objects_1 = motion_comp_arm_s.lo -+ cpu_state.c motion_comp_arm_s.S motion_comp_neon.c -+@ARCH_ARM_TRUE@am__objects_1 = motion_comp_arm_s.lo \ -+@ARCH_ARM_TRUE@ libmpeg2arch_la-motion_comp_neon.lo - am_libmpeg2arch_la_OBJECTS = libmpeg2arch_la-motion_comp_mmx.lo \ - libmpeg2arch_la-idct_mmx.lo \ - libmpeg2arch_la-motion_comp_altivec.lo \ -@@ -82,7 +86,7 @@ - libmpeg2arch_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmpeg2arch_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/.auto/depcomp - am__depfiles_maybe = depfiles - CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -135,29 +139,25 @@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GREP = @GREP@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@ - LIBOBJS = @LIBOBJS@ -@@ -165,16 +165,20 @@ - LIBTOOL = @LIBTOOL@ - LIBVO_CFLAGS = @LIBVO_CFLAGS@ - LIBVO_LIBS = @LIBVO_LIBS@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ - MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@ -+NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - OPT_CFLAGS = @OPT_CFLAGS@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -199,8 +203,7 @@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -231,6 +234,7 @@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -301,8 +305,8 @@ - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -@@ -310,8 +314,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -355,6 +359,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_altivec.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_arm.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_mmx.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpeg2arch_la-motion_comp_vis.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_comp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motion_comp_arm_s.Plo@am__quote@ -@@ -472,6 +477,13 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmpeg2arch_la_CFLAGS) $(CFLAGS) -c -o libmpeg2arch_la-cpu_state.lo `test -f 'cpu_state.c' || echo '$(srcdir)/'`cpu_state.c - -+libmpeg2arch_la-motion_comp_neon.lo: motion_comp_neon.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmpeg2arch_la_CFLAGS) $(CFLAGS) -MT libmpeg2arch_la-motion_comp_neon.lo -MD -MP -MF $(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Tpo -c -o libmpeg2arch_la-motion_comp_neon.lo `test -f 'motion_comp_neon.c' || echo '$(srcdir)/'`motion_comp_neon.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Tpo $(DEPDIR)/libmpeg2arch_la-motion_comp_neon.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='motion_comp_neon.c' object='libmpeg2arch_la-motion_comp_neon.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmpeg2arch_la_CFLAGS) $(CFLAGS) -c -o libmpeg2arch_la-motion_comp_neon.lo `test -f 'motion_comp_neon.c' || echo '$(srcdir)/'`motion_comp_neon.c -+ - mostlyclean-libtool: - -rm -f *.lo - -@@ -570,8 +582,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -596,8 +608,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -607,12 +619,13 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -+ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique diff --git a/tools/osx/osx-depends/libmpeg2/Makefile b/tools/osx/osx-depends/libmpeg2/Makefile deleted file mode 100644 index 973af2e664020..0000000000000 --- a/tools/osx/osx-depends/libmpeg2/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libmpeg2 -VERSION=0.5.1 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-sdl - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-libmpeg2-add-asm-leading-underscores.patch - cd $(SOURCE); patch -p1 < ../03-config-fix.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libogg/Makefile b/tools/osx/osx-depends/libogg/Makefile deleted file mode 100644 index c167ad53ab9b9..0000000000000 --- a/tools/osx/osx-depends/libogg/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libogg -VERSION=1.1.4 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libpng/Makefile b/tools/osx/osx-depends/libpng/Makefile deleted file mode 100644 index 41d7e6dd3bd1e..0000000000000 --- a/tools/osx/osx-depends/libpng/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libpng -#VERSION=1.4.4 -VERSION=1.2.38 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch b/tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch deleted file mode 100644 index 358a0ff6f7a4a..0000000000000 --- a/tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -uNr rtmpdump-2.3/Makefile rtmpdump-2.3-org/Makefile ---- rtmpdump-2.3/Makefile 2010-06-30 15:58:35.000000000 -0400 -+++ rtmpdump-2.3-org/Makefile 2011-01-23 13:50:03.000000000 -0500 -@@ -2,8 +2,8 @@ - - prefix=/usr/local - --CC=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld -+#CC=$(CROSS_COMPILE)gcc -+#LD=$(CROSS_COMPILE)ld - - SYS=posix - #SYS=mingw -@@ -33,10 +33,12 @@ - - LIBS_posix= - LIBS_mingw=-lws2_32 -lwinmm -lgdi32 -+LIBS_darwin= - LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) - - THREADLIB_posix=-lpthread - THREADLIB_mingw= -+THREADLIB_darwin=-lpthread - THREADLIB=$(THREADLIB_$(SYS)) - SLIBS=$(THREADLIB) $(LIBS) - -@@ -45,6 +47,7 @@ - - EXT_posix= - EXT_mingw=.exe -+EXT_darwin= - EXT=$(EXT_$(SYS)) - - all: $(LIBRTMP) progs -diff -uNr rtmpdump-2.3/librtmp/Makefile rtmpdump-2.3-org/librtmp/Makefile ---- rtmpdump-2.3/librtmp/Makefile 2010-06-30 16:01:28.000000000 -0400 -+++ rtmpdump-2.3-org/librtmp/Makefile 2011-01-23 13:56:46.000000000 -0500 -@@ -2,9 +2,9 @@ - - prefix=/usr/local - --CC=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld --AR=$(CROSS_COMPILE)ar -+#CC=$(CROSS_COMPILE)gcc -+#LD=$(CROSS_COMPILE)ld -+#AR=$(CROSS_COMPILE)ar - - SYS=posix - CRYPTO=OPENSSL -@@ -27,8 +27,14 @@ - - SO_posix=so.0 - SO_mingw=dll -+SO_darwin=0.dylib - SO_EXT=$(SO_$(SYS)) - -+SO_LDFLAGS_posix=-shared -Wl,-soname,$@ -+SO_LDFLAGS_mingw= -+SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace $(XLDFLAGS) -+SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) -+ - SHARED=yes - SODEF_yes=-fPIC - SOLIB_yes=librtmp.$(SO_EXT) -@@ -61,7 +67,7 @@ - $(AR) rs $@ $? - - librtmp.$(SO_EXT): $(OBJS) -- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) -+ $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) - ln -sf $@ librtmp.so - - log.o: log.c log.h Makefile -@@ -87,5 +93,9 @@ - cp librtmp.so.0 $(LIBDIR) - cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so - -+install_0.dylib: librtmp.0.dylib -+ cp librtmp.0.dylib $(LIBDIR) -+ cd $(LIBDIR); ln -sf librtmp.0.dylib librtmp.dylib -+ - install_dll: librtmp.dll - cp librtmp.dll $(BINDIR) diff --git a/tools/osx/osx-depends/librtmp/Makefile b/tools/osx/osx-depends/librtmp/Makefile deleted file mode 100644 index 2e4feead26ce1..0000000000000 --- a/tools/osx/osx-depends/librtmp/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=rtmpdump -VERSION=2.3 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tgz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-make_shared_lib_for_darwin-tag2.3.patch - -$(LIBDYLIB): $(SOURCE) - make SYS=darwin prefix=$(PREFIX) XCFLAGS="$(CFLAGS)" XLDFLAGS="$(LDFLAGS)" -C $(SOURCE)/librtmp - -.installed: - make SYS=darwin prefix=$(PREFIX) -C $(SOURCE)/librtmp install - touch $@ - -clean: - make SYS=darwin -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libsamplerate/01-libsamplerate-arm.patch b/tools/osx/osx-depends/libsamplerate/01-libsamplerate-arm.patch deleted file mode 100644 index b14b0dac571a7..0000000000000 --- a/tools/osx/osx-depends/libsamplerate/01-libsamplerate-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN libsamplerate-0.1.7/src/float_cast.h.org src/float_cast.h ---- libsamplerate-0.1.7/src/float_cast.h.org 2010-10-28 21:00:19.000000000 -0400 -+++ libsamplerate-0.1.7/src/float_cast.h 2010-10-28 21:00:52.000000000 -0400 -@@ -193,7 +193,7 @@ - return res [1] ; - } /* double2int */ - --#elif (defined (__MACH__) && defined (__APPLE__)) -+#elif (defined (__MACH__) && defined (__APPLE__) && !defined(__arm__)) - - /* For Apple MacOSX. */ - - diff --git a/tools/osx/osx-depends/libsamplerate/Makefile b/tools/osx/osx-depends/libsamplerate/Makefile deleted file mode 100644 index ceaf935d83497..0000000000000 --- a/tools/osx/osx-depends/libsamplerate/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libsamplerate -VERSION=0.1.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-sndfile --disable-fftw - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-libsamplerate-arm.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libsdl/01-SDL_SetWidthHeight.patch b/tools/osx/osx-depends/libsdl/01-SDL_SetWidthHeight.patch deleted file mode 100644 index 6213a01e4e7de..0000000000000 --- a/tools/osx/osx-depends/libsdl/01-SDL_SetWidthHeight.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: include/SDL_video.h -=================================================================== ---- include/SDL_video.h (revision 4116) -+++ include/SDL_video.h (working copy) -@@ -287,6 +287,11 @@ - extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags); - - /* -+ * Alter the width and height of the current surface to the given sizes. -+ */ -+extern DECLSPEC void SDLCALL SDL_SetWidthHeight(int width, int height); -+ -+/* - * Set up a video mode with the specified width, height and bits-per-pixel. - * - * If 'bpp' is 0, it is treated as the current display bits per pixel. -Index: src/video/SDL_video.c -=================================================================== ---- src/video/SDL_video.c (revision 4116) -+++ src/video/SDL_video.c (working copy) -@@ -1949,3 +1949,11 @@ - return(0); - } - } -+ -+void SDL_SetWidthHeight(int width, int height) -+{ -+ if (current_video != NULL && current_video->screen != NULL) { -+ current_video->screen->w = width; -+ current_video->screen->h = height; -+ } -+} diff --git a/tools/osx/osx-depends/libsdl/Makefile b/tools/osx/osx-depends/libsdl/Makefile deleted file mode 100644 index fac37e85f4bb6..0000000000000 --- a/tools/osx/osx-depends/libsdl/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=SDL -VERSION=1.2.13 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --without-x --disable-video-x11 - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - echo $(ARCHIVE) > .gitignore - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p0 < ../01-SDL_SetWidthHeight.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libsdl_image/Makefile b/tools/osx/osx-depends/libsdl_image/Makefile deleted file mode 100644 index 3e0a537d08c94..0000000000000 --- a/tools/osx/osx-depends/libsdl_image/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=SDL_image -VERSION=1.2.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --disable-jpg-shared --disable-png-shared --disable-tif-shared --disable-sdltest - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).a - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libsdl_mixer/Makefile b/tools/osx/osx-depends/libsdl_mixer/Makefile deleted file mode 100644 index da0d394c4528f..0000000000000 --- a/tools/osx/osx-depends/libsdl_mixer/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=SDL_mixer -VERSION=1.2.8 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - --disable-music-ogg --disable-music-mp3 \ - --disable-music-mod --disable-music-midi --disable-smpegtest --disable-sdltest - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).a - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libssh2/Makefile b/tools/osx/osx-depends/libssh2/Makefile deleted file mode 100644 index f47b232f6aab4..0000000000000 --- a/tools/osx/osx-depends/libssh2/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libssh2 -VERSION=1.2.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --with-openssl --without-libgcrypt - -SHELL := /bin/bash -RM := rm -rf - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/osx-depends/libtool/Makefile b/tools/osx/osx-depends/libtool/Makefile deleted file mode 100644 index 18df9d2234e37..0000000000000 --- a/tools/osx/osx-depends/libtool/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -LIBNAME=libtool -VERSION=2.2.6 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE)a.tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) \ - --program-prefix=g - -LIBDYLIB=$(SOURCE)/bin/libtool - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libvorbis/Makefile b/tools/osx/osx-depends/libvorbis/Makefile deleted file mode 100644 index 4a9cb6d236505..0000000000000 --- a/tools/osx/osx-depends/libvorbis/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=libvorbis -VERSION=1.2.3 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-oggtest --disable-docs --disable-examples - -LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - sed -ie "s|DDARWIN -fno-common -force_cpusubtype_ALL|DARWIN_NO_CARBON -fno-common -noforce_cpusubtype_ALL|" "$(SOURCE)/configure" - sed -ie "s|SUBDIRS = m4 include vq lib examples test doc|SUBDIRS = m4 include lib|" "$(SOURCE)/Makefile.in" - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/libyajl/Makefile b/tools/osx/osx-depends/libyajl/Makefile deleted file mode 100644 index 6928f460d5ee0..0000000000000 --- a/tools/osx/osx-depends/libyajl/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=lloyd-yajl -VERSION=1.0.12 -SOURCE=lloyd-yajl-17b1790 -ARCHIVE=lloyd-yajl-1.0.12-0-g17b1790.tar.gz -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) - -LIBDYLIB=$(SOURCE)/build/yajl-1.0.12/lib/libyajl.dylib - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - sed -ie "s|ADD_CUSTOM_TARGET|#ADD_CUSTOM_TARGET|g" "$(SOURCE)/CMakeLists.txt" - sed -ie "s|./run_tests.sh|#./run_tests.sh|g" "$(SOURCE)/CMakeLists.txt" - sed -ie "s|WORKING_DIRECTORY|#WORKING_DIRECTORY|g" "$(SOURCE)/CMakeLists.txt" - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/mysqlclient/Makefile b/tools/osx/osx-depends/mysqlclient/Makefile deleted file mode 100644 index 6b7c1fbfc89d5..0000000000000 --- a/tools/osx/osx-depends/mysqlclient/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -LIBNAME=mysql -VERSION=5.1.55 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ - --enable-thread-safe-client -with-extra-charsets=complex \ - --without-readline --without-server --without-bench --without-docs --without-man - -LIBDYLIB=$(SOURCE)/libmysql/.libs/$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE)/scripts install - make -C $(SOURCE)/include install - make -C $(SOURCE)/libmysql install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/openssl/Makefile b/tools/osx/osx-depends/openssl/Makefile deleted file mode 100644 index 3b79faa972322..0000000000000 --- a/tools/osx/osx-depends/openssl/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=openssl -VERSION=0.9.8r -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./Configure darwin-i386-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX) - -LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install_sw - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/pcre/Makefile b/tools/osx/osx-depends/pcre/Makefile deleted file mode 100644 index 5fca72b95bd4d..0000000000000 --- a/tools/osx/osx-depends/pcre/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=pcre -VERSION=7.9 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --disable-stack-for-recursion - -LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/pkg-config/Makefile b/tools/osx/osx-depends/pkg-config/Makefile deleted file mode 100644 index 8350118baaf8b..0000000000000 --- a/tools/osx/osx-depends/pkg-config/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -LIBNAME=pkg-config -VERSION=0.23 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) --enable-indirect-deps --with-pc-path=$(PREFIX)/lib/pkgconfig:$(PREFIX)/share/pkgconfig - -LIBDYLIB=$(SOURCE)/bin/pkg-config - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/python26/Makefile b/tools/osx/osx-depends/python26/Makefile deleted file mode 100644 index b6442b47d7b98..0000000000000 --- a/tools/osx/osx-depends/python26/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install -# - -include ../config.mk - -# lib name, version -LIBNAME=Python -VERSION=2.6.5 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.bz2 -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs - -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export EXTRA_CFLAGS=$(CFLAGS) -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ - --disable-toolbox-glue --enable-unicode=ucs4 - -LIBDYLIB=$(SOURCE)/libpython2.6.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - # python2.6 has an issue detecting and using the same version of openssl in configure and setup.py - # this forces python2.6 hashlib to be compatible with osx 10.4 boxes. - sed -ie "s|openssl_ver >= 0x00907000)|openssl_ver >= 0x00907000 and False)|" "$(SOURCE)/setup.py" - sed -ie "s|(openssl_ver < 0x00908000)|(True or openssl_ver < 0x00908000)|" "$(SOURCE)/setup.py" - cd $(SOURCE); make - -.installed: - cd $(SOURCE); make install - find $(PREFIX)/lib/python2.6 -type f -name *.pyc -exec rm -f {} \; - find $(PREFIX)/lib/python2.6 -type f -name *.pyo -exec rm -f {} \; - touch $@ - -clean: - rm -rf $(SOURCE) .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/osx-depends/readline/Makefile b/tools/osx/osx-depends/readline/Makefile deleted file mode 100644 index 4ccbf69602c55..0000000000000 --- a/tools/osx/osx-depends/readline/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=readline -VERSION=6.0 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/shlib/(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); autoconf - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/samba/Makefile b/tools/osx/osx-depends/samba/Makefile deleted file mode 100644 index 0e74c02f634de..0000000000000 --- a/tools/osx/osx-depends/samba/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=samba -VERSION=3.5.6 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export LDFLAGS+=-Wl,-unexported_symbol,_MD5* -lc -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --without-cluster-support --disable-swat --without-ldap --without-pam --without-pam_smbpass --with-fhs \ - ac_cv_header_libunwind_h=no \ - ac_cv_header_execinfo_h=no \ - samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no - -LIBDYLIB=$(SOURCE)/source3/bin/libsmbclient.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(LIBDYLIB): $(TARBALLS_LOCATION)/$(ARCHIVE) - rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE)/source3; ./autogen.sh - cd $(SOURCE)/source3; $(CONFIGURE) - #cp -f /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(platform_sdk_version).sdk/usr/include/crt_externs.h $(PREFIX)/include/ - cd $(SOURCE)/source3; make bin/libsmbclient.dylib - -.installed: - cp -f $(SOURCE)/source3/include/libsmbclient.h $(PREFIX)/include/ - cp -f $(SOURCE)/source3/bin/libtdb.dylib.1 $(PREFIX)/lib/ - cp -f $(SOURCE)/source3/bin/libtalloc.dylib.2 $(PREFIX)/lib/ - cp -f $(SOURCE)/source3/bin/libsmbclient.dylib.0 $(PREFIX)/lib/ - cd $(PREFIX)/lib; ln -sf libsmbclient.dylib.0 libsmbclient.dylib - install_name_tool -id $(PREFIX)/lib/libtdb.dylib.1 $(PREFIX)/lib/libtdb.dylib.1 - install_name_tool -id $(PREFIX)/lib/libtalloc.dylib.2 $(PREFIX)/lib/libtalloc.dylib.2 - install_name_tool -id $(PREFIX)/lib/libsmbclient.dylib.0 $(PREFIX)/lib/libsmbclient.dylib.0 - install_name_tool -change bin/libtdb.dylib.1 $(PREFIX)/lib/libtdb.dylib.1 \ - $(PREFIX)/lib/libsmbclient.dylib.0 - install_name_tool -change bin/libtalloc.dylib.2 $(PREFIX)/lib/libtalloc.dylib.2 \ - $(PREFIX)/lib/libsmbclient.dylib.0 - touch $@ - -clean: - make -C $(SOURCE)/source3 clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/sqlite3/Makefile b/tools/osx/osx-depends/sqlite3/Makefile deleted file mode 100644 index fc319f67d206c..0000000000000 --- a/tools/osx/osx-depends/sqlite3/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=sqlite -VERSION=3.6.11 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -#BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -BASE_URL=http://www.sqlite.org -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export CXXFLAGS+=-DSQLITE_ENABLE_COLUMN_METADATA=1 -export TCLLIBDIR=/dev/null -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ - --enable-threadsafe --disable-tcl \ - --with-readline-inc="-I${PREFIX}/include" \ - --with-readline-lib="-L${PREFIX}/lib -lreadline -lm -lncurses" - -LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm -f .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/tar/Makefile b/tools/osx/osx-depends/tar/Makefile deleted file mode 100644 index 416e9156e43e8..0000000000000 --- a/tools/osx/osx-depends/tar/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# app name, version -APPNAME=tar -VERSION=1.23 -SOURCE=$(APPNAME)-$(VERSION) -# download location and format -//BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -BASE_URL=http://ftp.gnu.org/gnu/tar -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -export LIBTOOL=builds/unix/libtool -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) \ ---program-transform-name=s/tar/gtar/ --disable-dependency-tracking - -CLEAN_FILES=$(ARCHIVE) $(SOURCE)/src/tar - -all: $(SOURCE)/src/tar .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(SOURCE)/src/tar: $(SOURCE) - cd $(SOURCE); make - -.installed: - make -C $(SOURCE) install - cd $(PREFIX)/bin; ln -s gtar tar; ln -s gtar gnutar - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed - diff --git a/tools/osx/osx-depends/test/configure.ac b/tools/osx/osx-depends/test/configure.ac deleted file mode 100644 index 0eba08e95c368..0000000000000 --- a/tools/osx/osx-depends/test/configure.ac +++ /dev/null @@ -1,3 +0,0 @@ -AC_INIT - -PKG_PROG_PKG_CONFIG diff --git a/tools/osx/osx-depends/tiff/Makefile b/tools/osx/osx-depends/tiff/Makefile deleted file mode 100644 index f593b28bcd0a9..0000000000000 --- a/tools/osx/osx-depends/tiff/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=tiff -VERSION=3.8.2 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared - -LIBDYLIB=$(SOURCE)/libtiff/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/osx-depends/xbmc/Makefile b/tools/osx/osx-depends/xbmc/Makefile deleted file mode 100644 index dc7775055abda..0000000000000 --- a/tools/osx/osx-depends/xbmc/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# A quick and dirty Makefile to configure xbmc -# - -include ../config.mk - -SOURCE=../../../../ -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ - PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ - PYTHON=$(PREFIX)/bin/python - -all: configure - -configure: - cd $(SOURCE); ./bootstrap - cd $(SOURCE); $(CONFIGURE) - #cd $(SOURCE); make xcode_depends diff --git a/tools/osx/osx-depends/yasm/Makefile b/tools/osx/osx-depends/yasm/Makefile deleted file mode 100644 index 42e8c77b43fa1..0000000000000 --- a/tools/osx/osx-depends/yasm/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -# lib name, version -APPNAME=yasm -VERSION=1.1.0 -SOURCE=$(APPNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -PREFIX:=/Users/Shared/xbmc-depends/osx-10.4_i386 -export PATH:=$(PREFIX)/bin:$(PATH) -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) - -APP=$(SOURCE)/$(APPNAME) - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(APP) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(APP): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/preflight b/tools/osx/preflight deleted file mode 100755 index e1fa21081c209..0000000000000 --- a/tools/osx/preflight +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/perl - -die("No HOME set, cannot install defaults.\n") - if !$ENV{HOME}; - -die("No XBMC_HOME set, cannot install defaults.\n") - if !$ENV{'XBMC_HOME'}; - -sub get_home { - return $ENV{'HOME'} if defined $ENV{'HOME'}; -} - -sub get_extras { - # XBMC_HOME is assumed to be always setup - return $ENV{'XBMC_HOME'}."/extras/" if get_os() eq "osx"; - return; -} - -sub get_xbmc_home { - my $os = get_os(); - my $home = get_home(); - return if !defined $home; - if ( $os eq "osx" ) { - return $home."/Library/Application Support/XBMC"; - } - elsif ( $os eq "linux" ) { - return $home."/.xbmc"; - } - return; -} - -sub get_os { - if ( defined $ENV{'OSTYPE'} && $ENV{'OSTYPE'} =~ /linux/ ) { - return "linux"; - } - return "osx"; -} - -sub get_userdata_path { - my $xhome = get_xbmc_home(); - return if !defined $xhome; - return "$xhome/userdata"; -} - -sub setup_sources { - my $xbmchome = get_xbmc_home(); - my $userdata = get_userdata_path(); - my $sources = $userdata."/sources.xml"; - - # check whether a sources.xml already exists, and if it does back it up - if ( -f $sources ) { - print STDERR "sources.xml found at \"$sources\", backing up\n"; - my $backup_sources = $sources.".".time().".xml"; - `cp -f \"$sources\" \"$backup_sources\"`; - } - - # construct a sources.xml string - my $sources_xml = get_sources_xml( get_default_sources() ); - if ( $sources_xml ) { - open SOURCES, ">$sources" || exit; - print SOURCES get_sources_xml( get_default_sources() ); - close SOURCES; - } -} - -sub get_sources_xml { - my $sources = shift; - my ($sourcetype, $source); - - return if !defined $sources; - - my $xml = "\n"; - while ( ($sourcetype, $source) = each ( %$sources ) ) { - $xml .= (" " x 4)."<$sourcetype>\n"; - $xml .= (" " x 8)."\n"; - my ($name, $path); - while ( ($name, $path) = each( %{ $source } ) ) { - $xml .= (" " x 8)."\n"; - $xml .= (" " x 12)."$name\n"; - if ( $path =~ /(.*)\^\^(.*)/ ) { - $xml .= (" " x 12)."".$1."\n"; - $xml .= (" " x 12)."".$2."\n"; - } - else { - $xml .= (" " x 12)."".$path."\n"; - } - $xml .= (" " x 8)."\n"; - } - $xml .= (" " x 4)."\n"; - } - $xml .= "\n"; - return $xml; -} - -sub get_default_sources { - my $sources = {}; - my $home = get_home(); - my $xbmchome = get_xbmc_home(); - return if !defined $xbmchome; - - $sources->{'programs'} = {}; - $sources->{'video'} = {}; - $sources->{'music'} = {}; - $sources->{'pictures'} = {}; - $sources->{'files'} = {}; - - if ( get_os() eq "osx" ) { - - # Default sources for OS X - $sources->{'music'}->{'Music'} = $home."/Music"; - $sources->{'music'}->{'Music Playlists'} = "special://musicplaylists"; - $sources->{'video'}->{'Movies'} = $home."/Movies"; - $sources->{'video'}->{'Video Playlists'} = "special://videoplaylists"; - $sources->{'pictures'}->{'Pictures'} = $home."/Pictures"; - } - elsif ( get_os() eq "linux" ) { - - # Default source for Linux - for my $key ( keys %$sources ) { - $sources->{$key}->{'Media'} = "/media"; - $sources->{$key}->{'Home'} = "$home"; - $sources->{$key}->{'Desktop'} = "$home/Desktop"; - $sources->{$key}->{'Root'} = "/"; - } - } - return $sources; -} - -sub first_xbmc_run() { - my $home = get_xbmc_home(); - if ( ! -f "$home/.setup_complete" ) { - return 1; - } - return; -} - -sub first_xbmc_version_run() { - my $home = get_xbmc_home(); - if ( ! -f "$home/.setup_complete" ) { - return 1; - } - return; -} - -sub setup_default_xbmc() { - my $extras = get_extras(); - my $xhome = get_xbmc_home(); - my $userdata = get_userdata_path(); - - die("No extras :(\n") - if !defined $extras; - die("No XBMC home folder :(\n") - if !defined $xhome; - die ("No userdata folder :(\n") - if !defined $userdata; - - # create userdata directory if it doesn't exist - `mkdir -p "$userdata"`; - # copy extra stuff to xbmc's userdata directory - `cp -fRv "$extras/user/" "$userdata"`; - - setup_sources(); - `touch -f "$xhome/.setup_complete"`; -} - -sub setup_version_xbmc() { - #TODO -} - -if (first_xbmc_run()) { - setup_default_xbmc(); -} - -if (first_xbmc_version_run()) { - setup_version_xbmc(); -} diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 28f7cf74d36df..007457e85b3ac 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -443,7 +443,7 @@ void CApplication::Preflight() CUtil::GetHomePath(install_path); setenv("XBMC_HOME", install_path.c_str(), 0); - install_path += "/tools/preflight"; + install_path += "/tools/darwin/runtime/preflight"; system(install_path.c_str()); #endif } diff --git a/xbmc/osx/XBMCHelper.cpp b/xbmc/osx/XBMCHelper.cpp index 637540af1d3cb..52a3c436d7283 100644 --- a/xbmc/osx/XBMCHelper.cpp +++ b/xbmc/osx/XBMCHelper.cpp @@ -70,11 +70,11 @@ XBMCHelper::XBMCHelper() m_homepath = homePath; // Compute the helper filename. - m_helperFile = m_homepath + "/tools/"; + m_helperFile = m_homepath + "/tools/darwin/runtime/"; m_helperFile += XBMC_HELPER_PROGRAM; // Compute the local (pristine) launch agent filename. - m_launchAgentLocalFile = m_homepath + "/tools/"; + m_launchAgentLocalFile = m_homepath + "/tools/darwin/runtime/"; m_launchAgentLocalFile += XBMC_LAUNCH_PLIST; // Compute the install path for the launch agent.