Here's a preview of my pending changes. I have a question about the impacts of updating ffmpeg and it's dependency libs, have I done the changes to it correctly? Also Oliver updated the build for icu and I have changed it here, but there's not a newer build of it's dev package, should that also get updated? I have a few more to update, which I will probably get to much later today, so I won't be pushing this just yet. -scottmc diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 7a60489..16e2961 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -66,8 +66,8 @@ if $(HAIKU_BUILD_FEATURE_SSL) { # ICU # Note ICU isn't actually optional, but is still an external package -HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1-x86-gcc2-2011-11-02a.zip ; -HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-11-02.zip ; +HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-r1a4-x86-gcc2-2012-08-29.zip ; +HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1.1-r1a4-x86-gcc4-2012-08-29.zip ; HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ; if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { @@ -224,19 +224,19 @@ if $(TARGET_ARCH) = x86 { local ffmpegBaseURL = $(baseURL)/lib ; if $(TARGET_ARCH) = x86 { if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-x86-gcc4-2012-03-28.zip ; - HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc4-2012-03-12.zip ; - HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc4-2012-03-12.zip ; - HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc4-2012-03-12.zip ; - HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc4-2012-03-12.zip ; - HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc4-2012-03-14.zip ; + HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-r1a4-x86-gcc4-2012-09-02.zip ; + HAIKU_SPEEX_FILE = speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip ; + HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip ; + HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip ; + HAIKU_LIBOGG_FILE = libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip ; + HAIKU_LIBVPX_FILE = libvpx-1.0.0-r1a4-x86-gcc4-2012-09-02.zip ; } else { - HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-x86-gcc2-2012-03-28.zip ; - HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc2-2012-03-11.zip ; - HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc2-2012-03-11.zip ; - HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc2-2012-03-11.zip ; - HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc2-2012-03-11.zip ; - HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc2-2012-03-14.zip ; + HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-r1a4-x86-gcc2-2012-08-30.zip ; + HAIKU_SPEEX_FILE = speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip ; + HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip ; + HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip ; + HAIKU_LIBOGG_FILE = libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip ; + HAIKU_LIBVPX_FILE = libvpx-1.0.0-r1a4-x86-gcc2-2012-08-29.zip ; } local ffmpegZipFile = [ DownloadFile $(HAIKU_FFMPEG_FILE) @@ -346,9 +346,9 @@ if $(TARGET_ARCH) = x86 { local mikmodBaseURL = http://haiku-files.org/files/optional-packages/lib ; if $(TARGET_ARCH) = x86 { if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip ; + HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a4-x86-gcc4-2012-09-02.zip ; } else { - HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip ; + HAIKU_MIKMOD_FILE = libmikmod-3.1.11-r1a4-x86-gcc2-2012-08-29.zip ; } local mikmodZipFile = [ DownloadFile $(HAIKU_MIKMOD_FILE) @@ -380,7 +380,7 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = ppc { HAIKU_FREETYPE_FILE = freetype-2.4.9-ppc-gcc4-2012-06-26.zip ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc4-2012-06-15.zip ; + HAIKU_FREETYPE_FILE = freetype-2.4.9-r1a4-x86-gcc4-2012-09-02.zip ; } else { HAIKU_FREETYPE_FILE = freetype-2.4.9-r1a4-x86-gcc2-2012-08-28.zip ; } @@ -425,7 +425,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] { HAIKU_BUILD_FEATURE_TAGLIB = 1 ; } -HAIKU_TAGLIB_PACKAGE = taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip ; +HAIKU_TAGLIB_PACKAGE = taglib-1.7.2-r1a4-x86-gcc2-2012-08-30.zip ; HAIKU_TAGLIB_URL = $(baseURL)/$(HAIKU_TAGLIB_PACKAGE) ; if $(HAIKU_BUILD_FEATURE_TAGLIB) { diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages index d1902ea..b02eada 100644 --- a/build/jam/OptionalLibPackages +++ b/build/jam/OptionalLibPackages @@ -83,13 +83,13 @@ if [ IsOptionalHaikuImagePackageAdded fribidi ] { Echo "No optional package fribidi available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc4-2011-05-26.zip + fribidi-0.19.2-r1a4-x86-gcc4-2012-09-01.zip + : $(baseURL)/lib/fribidi-0.19.2-r1a4-x86-gcc4-2012-09-01.zip : : true ; } else { InstallOptionalHaikuImagePackage - fribidi-0.19.2-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/fribidi-0.19.2-r1a3-x86-gcc2-2011-05-19.zip + fribidi-0.19.2-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/fribidi-0.19.2-r1a4-x86-gcc2-2012-08-29.zip : : true ; } } @@ -101,13 +101,13 @@ if [ IsOptionalHaikuImagePackageAdded lcms ] { Echo "No optional package lcms available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc4-2011-05-26.zip + lcms-2.1-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/lcms-2.1-r1a4-x86-gcc4-2012-09-02.zip : : true ; } else { InstallOptionalHaikuImagePackage - lcms-2.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/lcms-2.1-r1a3-x86-gcc2-2011-05-19.zip + lcms-2.1-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/lcms-2.1-r1a4-x86-gcc2-2012-08-29.zip : : true ; } } @@ -119,13 +119,13 @@ if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] { Echo "No optional package libart_lgpl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libart_lgpl-2.3.21-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc4-2011-05-26.zip + libart_lgpl-2.3.21-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libart_lgpl-2.3.21-r1a4-x86-gcc4-2012-09-02.zip : : true ; } else { InstallOptionalHaikuImagePackage - libart_lgpl-2.3.21-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libart_lgpl-2.3.21-r1a3-x86-gcc2-2011-05-19.zip + libart_lgpl-2.3.21-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libart_lgpl-2.3.21-r1a4-x86-gcc2-2012-08-29.zip : : true ; } } @@ -137,13 +137,13 @@ if [ IsOptionalHaikuImagePackageAdded libmad ] { Echo "No optional package libmad available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc4-2011-05-26.zip + libmad-0.15.1b-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libmad-0.15.1b-r1a4-x86-gcc4-2012-09-02.zip : : true ; } else { InstallOptionalHaikuImagePackage - libmad-0.15.1b-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libmad-0.15.1b-r1a3-x86-gcc2-2011-05-19.zip + libmad-0.15.1b-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libmad-0.15.1b-r1a4-x86-gcc2-2012-08-29.zip : : true ; } } @@ -155,13 +155,13 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] { Echo "No optional package libmikmod available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc4-2011-05-26.zip + libmikmod-3.1.11-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libmikmod-3.1.11-r1a4-x86-gcc4-2012-09-02.zip : : true ; } else { InstallOptionalHaikuImagePackage - libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libmikmod-3.1.11-r1a3-x86-gcc2-2011-05-19.zip + libmikmod-3.1.11-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libmikmod-3.1.11-r1a4-x86-gcc2-2012-08-29.zip : : true ; } } @@ -173,13 +173,13 @@ if [ IsOptionalHaikuImagePackageAdded libmodplug ] { Echo "No optional package libmodplug available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc4-2011-05-26.zip + libmodplug-0.8.8.4-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libmodplug-0.8.8.4-r1a4-x86-gcc4-2012-09-02.zip : : true ; } else { InstallOptionalHaikuImagePackage - libmodplug-0.8.8.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libmodplug-0.8.8.1-r1a3-x86-gcc2-2011-05-19.zip + libmodplug-0.8.8.4-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libmodplug-0.8.8.4-r1a4-x86-gcc2-2012-08-29.zip : : true ; } } @@ -191,13 +191,13 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] { Echo "No optional package libpaper available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc4-2011-05-26.zip + libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip + : $(baseURL)/lib/libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip : : true ; } else { InstallOptionalHaikuImagePackage - libpaper-1.1.24-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libpaper-1.1.24-r1a3-x86-gcc2-2011-05-19.zip + libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip + : $(baseURL)/lib/libpaper-1.1.24-r1a4-x86-gcc4-2012-09-01.zip : : true ; } } @@ -227,78 +227,78 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] { Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libsdl-1.2.15-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/libsdl-1.2.15-x86-gcc4-2012-05-31.zip ; + libsdl-1.2.15-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libsdl-1.2.15-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - guilib-1.2.1-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2012-05-31.zip ; + guilib-1.2.1-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/guilib-1.2.1-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - sdl-gfx-2.0.23-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/sdl-gfx-2.0.23-x86-gcc4-2012-05-31.zip ; + sdl-gfx-2.0.23-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/sdl-gfx-2.0.23-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - sdl-image-1.2.12-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/sdl-image-1.2.12-x86-gcc4-2012-05-31.zip ; + sdl-image-1.2.12-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/sdl-image-1.2.12-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip ; + sdl-mixer-1.2.11-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/sdl-mixer-1.2.11-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - sdl-net-1.2.8-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/sdl-net-1.2.8-x86-gcc4-2012-05-31.zip ; + sdl-net-1.2.8-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/sdl-net-1.2.8-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - sdl-sound-1.0.3-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc4-2012-05-31.zip ; + sdl-sound-1.0.3-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/sdl-sound-1.0.3-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc4-2011-05-26.zip ; + sdl-rtf-0.1.0-r1a4-x86-gcc4-2012-09-03.zip + : $(baseURL)/lib/sdl-rtf-0.1.0-r1a4-x86-gcc4-2012-09-03.zip ; InstallOptionalHaikuImagePackage - sdl-ttf-2.0.11-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/sdl-ttf-2.0.11-x86-gcc4-2012-05-31.zip ; + sdl-ttf-2.0.11-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/sdl-ttf-2.0.11-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - sge-030809-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/sge-030809-x86-gcc4-2012-05-31.zip ; + sge-030809-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/sge-030809-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - smjpeg-0.2.1-x86-gcc4-2012-05-31.zip - : $(baseURL)/lib/smjpeg-0.2.1-x86-gcc4-2012-05-31.zip ; + smjpeg-0.2.1-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/smjpeg-0.2.1-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - smpeg-0.4.5-x86-gcc4-2011-05-31.zip - : $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2012-05-31.zip ; + smpeg-0.4.5-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/smpeg-0.4.5-r1a4-x86-gcc4-2012-09-02.zip ; } else { InstallOptionalHaikuImagePackage - libsdl-1.2.15-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/libsdl-1.2.15-x86-gcc2-2012-06-24.zip ; + libsdl-1.2.15-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libsdl-1.2.15-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - guilib-1.2.1-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/guilib-1.2.1-x86-gcc2-2012-06-24.zip ; + guilib-1.2.1-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/guilib-1.2.1-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - sdl-gfx-2.0.23-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/sdl-gfx-2.0.23-x86-gcc2-2012-06-24.zip ; + sdl-gfx-2.0.23-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/sdl-gfx-2.0.23-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - sdl-image-1.2.12-x86-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/sdl-image-1.2.12-x86-gcc2-2012-06-24.zip ; + sdl-image-1.2.12-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/sdl-image-1.2.12-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - sdl-mixer-1.2.11-x86-gcc2-2012-06-25.zip - : $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc2-2012-06-25.zip ; + sdl-mixer-1.2.11-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/sdl-mixer-1.2.11-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - sdl-net-1.2.8-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/sdl-net-1.2.8-x86-gcc2-2012-06-24.zip ; + sdl-net-1.2.8-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/sdl-net-1.2.8-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - sdl-sound-1.0.3-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc2-2012-06-24.zip ; + sdl-sound-1.0-hg-r1a4-x86-gcc2-2012-08-30.zip + : $(baseURL)/lib/sdl-sound-1.0-hg-r1a4-x86-gcc2-2012-08-30.zip ; InstallOptionalHaikuImagePackage sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip : $(baseURL)/lib/sdl-rtf-0.1.0-r1a3-x86-gcc2-2011-05-20.zip ; InstallOptionalHaikuImagePackage - sdl-ttf-2.0.11-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/sdl-ttf-2.0.11-x86-gcc2-2012-06-24.zip ; + sdl-ttf-2.0.11-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/sdl-ttf-2.0.11-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - sge-030809-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/sge-030809-x86-gcc2-2012-06-24.zip ; + sge-030809-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/sge-030809-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - smjpeg-0.2.1-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/smjpeg-0.2.1-x86-gcc2-2012-06-24.zip ; + smjpeg-0.2.1-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/smjpeg-0.2.1-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - smpeg-0.4.5-x86-gcc2-2012-06-24.zip - : $(baseURL)/lib/smpeg-0.4.5-x86-gcc2-2012-06-24.zip ; + smpeg-0.4.5-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/smpeg-0.4.5-r1a4-x86-gcc2-2012-08-29.zip ; } } @@ -309,48 +309,48 @@ if [ IsOptionalHaikuImagePackageAdded XiphLibs ] { Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ; + flac-1.2.1-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/flac-1.2.1-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc4-2011-05-26.zip ; + libao-1.0.0-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libao-1.0.0-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc4-2011-05-26.zip ; + libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc4-2011-05-26.zip ; + libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc4-2011-05-26.zip ; + libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - speex-1.2rc1-x86-gcc4-2012-03-12.zip - : $(baseURL)/lib/speex-1.2rc1-x86-gcc4-2012-03-12.zip ; + speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip ; InstallOptionalHaikuImagePackage - vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc4-2011-05-26.zip ; + vorbis-tools-1.4.0-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/vorbis-tools-1.4.0-r1a4-x86-gcc4-2012-09-02.zip ; } else { InstallOptionalHaikuImagePackage - flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/flac-1.2.1-r1a3-x86-gcc2-2011-05-19.zip ; + flac-1.2.1-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/flac-1.2.1-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - libao-1.0.0-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libao-1.0.0-r1a3-x86-gcc2-2011-05-19.zip ; + libao-1.0.0-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libao-1.0.0-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - libogg-1.2.2-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libogg-1.2.2-r1a3-x86-gcc2-2011-05-19.zip ; + libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - libtheora-1.1.1-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libtheora-1.1.1-r1a3-x86-gcc2-2011-05-19.zip ; + libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - libvorbis-1.3.2-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/libvorbis-1.3.2-r1a3-x86-gcc2-2011-05-19.zip ; + libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - speex-1.2-git-r1a3-x86-gcc2-2011-05-26.zip - : $(baseURL)/lib/speex-1.2-git-r1a3-x86-gcc2-2011-05-26.zip ; + speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip ; InstallOptionalHaikuImagePackage - vorbis-tools-1.4.0-r1a3-x86-gcc2-2011-05-19.zip - : $(baseURL)/lib/vorbis-tools-1.4.0-r1a3-x86-gcc2-2011-05-19.zip ; + vorbis-tools-1.4.0-r1a4-x86-gcc2-2012-08-29.zip + : $(baseURL)/lib/vorbis-tools-1.4.0-r1a4-x86-gcc2-2012-08-29.zip ; } } diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 77acc4d..7a45429 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -384,8 +384,8 @@ if [ IsOptionalHaikuImagePackageAdded Caya ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { InstallOptionalHaikuImagePackage - caya-264-x86-gcc4-2012-05-20.zip - : $(baseURL)/caya-264-x86-gcc4-2012-05-20.zip + caya-264-r1a4-x86-gcc4-2012-08-31.zip + : $(baseURL)/caya-264-r1a4-x86-gcc4-2012-08-31.zip : : true ; InstallOptionalHaikuImagePackage caya-gpl-protocols-35-x86-gcc4-2012-05-20.zip @@ -527,8 +527,8 @@ if [ IsOptionalHaikuImagePackageAdded Ctags ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - ctags-5.8-x86-gcc4-2012-01-23.zip - : $(baseURL)/ctags-5.8-x86-gcc4-2012-01-23.zip + ctags-5.8-r1a4-x86-gcc4-2012-08-30.zip + : $(baseURL)/ctags-5.8-r1a4-x86-gcc4-2012-08-30.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1209,11 +1209,11 @@ if [ IsOptionalHaikuImagePackageAdded LibLayout ] { if $(TARGET_ARCH) != x86 { Echo "No optional package LibLayout available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage liblayout-1.4.1-r1a4-gcc4-2012-08-30.zip - : $(baseURL)/liblayout-1.4.1-r1a4-gcc4-2012-08-30.zip ; + InstallOptionalHaikuImagePackage liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip + : $(baseURL)/liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip ; } else { - InstallOptionalHaikuImagePackage liblayout-1.4.1-r1a4-gcc2-2012-08-28.zip - : $(baseURL)/liblayout-1.4.1-r1a4-gcc2-2012-08-28.zip ; + InstallOptionalHaikuImagePackage liblayout-1.4.1-r1a4-x86-gcc2-2012-08-28.zip + : $(baseURL)/liblayout-1.4.1-r1a4-x86-gcc2-2012-08-28.zip ; } } @@ -1224,8 +1224,8 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] { Echo "No optional package Libmng available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ; + libmng-1.0.10-r1a4-x86-gcc4-2012-09-02.zip + : $(baseURL)/lib/libmng-1.0.10-r1a4-x86-gcc4-2012-09-02.zip ; } else { InstallOptionalHaikuImagePackage libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip @@ -1292,8 +1292,8 @@ if [ IsOptionalHaikuImagePackageAdded Lua ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - lua-5.1.4-x86-gcc4-2010-10-30.zip - : $(baseURL)/lua-5.1.4-x86-gcc4-2010-10-30.zip + lua-5.1.4-3-r1a4-x86-gcc4-2012-09-01.zip + : $(baseURL)/lua-5.1.4-3-r1a4-x86-gcc4-2012-09-01.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1506,8 +1506,8 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - p7zip-9.20.1-x86-gcc4-2012-06-19.zip - : $(baseURL)/p7zip-9.20.1-x86-gcc4-2012-06-19.zip ; + p7zip-9.20.1-r1a4-x86-gcc4-2012-08-30.zip + : $(baseURL)/p7zip-9.20.1-r1a4-x86-gcc4-2012-08-30.zip ; } else { InstallOptionalHaikuImagePackage p7zip-9.20.1-r1a4-x86-gcc2-2012-08-29.zip @@ -1529,8 +1529,8 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip ; + paladin-1.3-r1a4-x86-gcc4-2012-08-30.zip + : $(baseURL)/paladin-1.3-r1a4-x86-gcc4-2012-08-30.zip ; } else { InstallOptionalHaikuImagePackage paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip @@ -1613,8 +1613,8 @@ if [ IsOptionalHaikuImagePackageAdded Puri ] { Echo "No optional package Puri for gcc2" ; } else { InstallOptionalHaikuImagePackage - puri-0.3.9.1-x86-gcc4-2012-08-16.zip - : $(baseURL)/puri-0.3.9.1-x86-gcc4-2012-08-16.zip ; + puri-0.3.9.1-r1a4-x86-gcc4-2012-08-31.zip + : $(baseURL)/puri-0.3.9.1-r1a4-x86-gcc4-2012-08-31.zip ; AddSymlinkToHaikuImage home config settings deskbar Applications : /boot/apps/Puri/Puri ; } @@ -1648,8 +1648,8 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - rsync-3.0.7-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/rsync-3.0.7-r1a3-x86-gcc4-2011-05-24.zip + rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip + : $(baseURL)/rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1667,8 +1667,8 @@ if [ IsOptionalHaikuImagePackageAdded Ruby ] { Echo "No optional package Ruby available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip ; + ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip + : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip ; } else { InstallOptionalHaikuImagePackage ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip @@ -1683,8 +1683,8 @@ if [ IsOptionalHaikuImagePackageAdded Sed ] { Echo "No optional package Sed available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip ; + sed-4.2.1-r1a4-x86-gcc4-2012-08-31.zip + : $(baseURL)/sed-4.2.1-r1a4-x86-gcc4-2012-08-31.zip ; } else { InstallOptionalHaikuImagePackage sed-4.2.1-r1a4-x86-gcc2-2012-08-27.zip