hrev49881 adds 2 changesets to branch 'master'
old head: e1ef395414c9b64406516a5c2ad9fbc702b16aa1
new head: 12b32ebf7aa99640f3211d733651986c455a239a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=12b32ebf7aa9+%5Ee1ef395414c9
----------------------------------------------------------------------------
c5c31f411823: haiku-x86/haiku-x86_gcc2: make some dependencies feature
dependent.
12b32ebf7aa9: Updated ffmpeg package for x86_64.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 34 insertions(+), 5 deletions(-)
build/jam/repositories/HaikuPorts/x86_64 | 7 ++-----
src/data/package_infos/x86/haiku | 16 ++++++++++++++++
src/data/package_infos/x86_gcc2/haiku | 16 ++++++++++++++++
############################################################################
Commit: c5c31f4118237acb96dc335732109ebc1009c49d
URL: http://cgit.haiku-os.org/haiku/commit/?id=c5c31f411823
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Nov 24 19:20:52 2015 UTC
haiku-x86/haiku-x86_gcc2: make some dependencies feature dependent.
----------------------------------------------------------------------------
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 97f8eb7..e3d5727 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -74,16 +74,32 @@ requires {
lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
+#ifdef HAIKU_BUILD_FEATURE_X86_EXPAT_ENABLED
lib:libexpat
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GUTENPRINT_ENABLED
lib:libgutenprint
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_LIBICNS_ENABLED
lib:libicns
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_JASPER_ENABLED
lib:libjasper
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_JPEG_ENABLED
lib:libjpeg
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_LIBPNG_ENABLED
lib:libpng >= 16.0
+#endif
lib:libqrencode
+#ifdef HAIKU_BUILD_FEATURE_X86_TIFF_ENABLED
lib:libtiff >= 5.2
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_LIBWEBP_ENABLED
lib:libwebp
#endif
+#endif
lib:libsolv
lib:libsolvext
lib:libstdc++
diff --git a/src/data/package_infos/x86_gcc2/haiku
b/src/data/package_infos/x86_gcc2/haiku
index eae0aea..8115ac4 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -74,16 +74,32 @@ requires {
lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_EXPAT_ENABLED
lib:libexpat
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_GUTENPRINT_ENABLED
lib:libgutenprint
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBICNS_ENABLED
lib:libicns
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JASPER_ENABLED
lib:libjasper
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JPEG_ENABLED
lib:libjpeg
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED
lib:libpng >= 16.0
+#endif
lib:libqrencode
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED
lib:libtiff >= 5.2
+#endif
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED
lib:libwebp
#endif
+#endif
lib:libsolv
lib:libsolvext
lib:libz
############################################################################
Revision: hrev49881
Commit: 12b32ebf7aa99640f3211d733651986c455a239a
URL: http://cgit.haiku-os.org/haiku/commit/?id=12b32ebf7aa9
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Nov 24 20:47:29 2015 UTC
Updated ffmpeg package for x86_64.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_64
b/build/jam/repositories/HaikuPorts/x86_64
index 48b8ebd..d5feb32 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -92,10 +92,8 @@ RemotePackageRepository HaikuPorts
file-5.25-1
file_devel-5.25-1
findutils-4.4.2-1
- ffmpeg-0.11.5-2
- ffmpeg_devel-0.11.5-2
- ffmpeg26-2.6.3-1
- ffmpeg26_devel-2.6.3-1
+ ffmpeg-2.8.2-1
+ ffmpeg_devel-2.8.2-1
flac-1.3.1-1
flac_devel-1.3.1-1
flex-2.5.39-1
@@ -418,7 +416,6 @@ RemotePackageRepository HaikuPorts
file
findutils
ffmpeg
- ffmpeg26
flac
flex
fontconfig
