zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make jpeg a virtual dependency. (#5190)

Browse Source 
* Make jpeg a virtual dependency.

* Make 'libjpeg-turbo' the default implementation of 'jpeg'.
This commit is contained in:
Sergey Kosukhin
2017-08-24 10:30:35 +02:00
committed by Massimiliano Culpo
parent 49a9d63be7
commit a48b5a627c
9 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
var/spack/repos/builtin/packages/isaac-server/jpeg.patch Normal file
View File

@@ -0,0 +1,34 @@
diff --git a/server/src/Broker.cpp b/server/src/Broker.cpp
index 03d60f4..aab449f 100644
--- a/server/src/Broker.cpp
+++ b/server/src/Broker.cpp
@@ -108,14 +108,14 @@ MetaDataClient* Broker::addDataClient()
}
boolean isaac_jpeg_fill_input_buffer(j_decompress_ptr cinfo)
{
- return true;
+ return TRUE;
}
void isaac_jpeg_skip_input_data(j_decompress_ptr cinfo,long num_bytes)
{
}
boolean isaac_jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired)
{
- return true;
+ return TRUE;
}
void isaac_jpeg_term_source(j_decompress_ptr cinfo)
{
diff --git a/server/src/URIImageConnector.cpp b/server/src/URIImageConnector.cpp
index 0b11800..e843aa4 100644
--- a/server/src/URIImageConnector.cpp
+++ b/server/src/URIImageConnector.cpp
@@ -40,7 +40,7 @@ void isaac_init_destination(j_compress_ptr cinfo)
}
boolean isaac_jpeg_empty_output_buffer(j_compress_ptr cinfo)
{
- return true;
+ return TRUE;
}
void isaac_jpeg_term_destination(j_compress_ptr cinfo)
{

5
var/spack/repos/builtin/packages/isaac-server/package.py
View File

@@ -42,10 +42,13 @@ class IsaacServer(CMakePackage):
# 'Support for RTP streams, e.g. to Twitch or Youtube')
depends_on('cmake@3.3:', type='build')
depends_on('libjpeg-turbo', type='link')
depends_on('jpeg', type='link')
depends_on('jansson', type='link')
depends_on('boost@1.56:', type='link')
depends_on('libwebsockets@2.1.1:', type='link')
# depends_on('gstreamer@1.0', when='+gstreamer')
# Until the pull request is merged: https://github.com/ComputationalRadiationPhysics/isaac/pull/70
patch('jpeg.patch')
root_cmakelists_dir = 'server'