diff options
Diffstat (limited to 'graphics/lprof-devel/files')
11 files changed, 0 insertions, 218 deletions
diff --git a/graphics/lprof-devel/files/patch-src-3rdparty-vigra-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-3rdparty-vigra-CMakeLists.txt deleted file mode 100644 index afea80b75a2e..000000000000 --- a/graphics/lprof-devel/files/patch-src-3rdparty-vigra-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- src/3rdparty/vigra/CMakeLists.txt 2008-02-19 18:01:35.000000000 -0300 -+++ src/3rdparty/vigra/CMakeLists.txt 2012-05-01 10:38:31.000000000 -0300 -@@ -1,6 +1,9 @@ --SET_DIRECTORY_PROPERTIES( -- PROPERTIEs -- INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include;${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR};${TIFF_INCLUDE_DIR}" -+INCLUDE_DIRECTORIES( -+ BEFORE -+ ${CMAKE_CURRENT_SOURCE_DIR}/include -+ ${PNG_INCLUDE_DIR} -+ ${JPEG_INCLUDE_DIR} -+ ${TIFF_INCLUDE_DIR} - ) - - SET(IMPEX_SOURCES diff --git a/graphics/lprof-devel/files/patch-src-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-CMakeLists.txt deleted file mode 100644 index 924fff15317c..000000000000 --- a/graphics/lprof-devel/files/patch-src-CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ ---- src/CMakeLists.txt 2008-02-19 18:01:32.000000000 -0300 -+++ src/CMakeLists.txt 2012-05-01 11:00:11.000000000 -0300 -@@ -129,7 +129,7 @@ ENDFOREACH(lprof_inc_dir) - - # Normally these are set for us. Since we're overriding the normal include path we've got to add them ourselves, but it's - # probably a good idea to be explicit about what we use anyway. --SET(lprof_qt_incs "${QT_INCLUDE_DIR};${QT_QT_INCLUDE_DIR};${QT_QTCORE_INCLUDE_DIR};${QT_QTGUI_INCLUDE_DIR};${QT_QTSVG_INCLUDE_DIR};${QT_QT3SUPPORT_INCLUDE_DIR};${QT_QTASSISTANT_INCLUDE_DIR}") -+SET(lprof_qt_incs "${QT_QT_INCLUDE_DIR};${QT_QTCORE_INCLUDE_DIR};${QT_QTGUI_INCLUDE_DIR};${QT_QTSVG_INCLUDE_DIR};${QT_QT3SUPPORT_INCLUDE_DIR};${QT_QTASSISTANT_INCLUDE_DIR}") - - - IF(NOT LIBVIGRAIMPEX_FOUND) -@@ -143,12 +143,21 @@ ELSE(NOT LIBVIGRAIMPEX_FOUND) - # Static/nonstatic flag should've been added by find script - ENDIF(NOT LIBVIGRAIMPEX_FOUND) - --SET_DIRECTORY_PROPERTIES( -- PROPERTIES -- INCLUDE_DIRECTORIES "${lprof_inc_dirs};${lprof_qt_incs};${ARGYLL_INCLUDE_DIRS};${impex_include};${LIBUSB_INCLUDE_DIR};${X11_INCLUDE_DIR};${ZLIB_INCLUDE_DIR};${JPEG_INCLUDE_DIR};${TIFF_INCLUDE_DIR};${CMAKE_CURRENT_BINARY_DIR};${WINDDK_INCLUDE_DIR}" -+INCLUDE_DIRECTORIES( -+ BEFORE -+ ${lprof_inc_dirs} -+ ${lprof_qt_incs} -+ ${ARGYLL_INCLUDE_DIRS} -+ ${impex_include} -+ ${LIBUSB_INCLUDE_DIR} -+ ${X11_INCLUDE_DIR} -+ ${ZLIB_INCLUDE_DIR} -+ ${JPEG_INCLUDE_DIR} -+ ${TIFF_INCLUDE_DIR} -+ ${CMAKE_CURRENT_BINARY_DIR} - ) - --TARGET_LINK_LIBRARIES(lprof liblprof lcmslocal argyll ${X11_VIDMODE_LIBRARIES} ${X11_LIBRARIES} ${impex_lib} ${LIBUSB_LIBRARIES} ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${COMMON_PLATFORM_LIBS} ${WINDDK_LIBRARIES}) -+TARGET_LINK_LIBRARIES(lprof liblprof lcmslocal argyll ${X11_VIDMODE_LIBRARIES} ${X11_LIBRARIES} ${impex_lib} ${LIBUSB_LIBRARIES} ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${COMMON_PLATFORM_LIBS} ${WINDDK_LIBRARIES} -pthread) - - SET_TARGET_PROPERTIES(lprof - PROPERTIES diff --git a/graphics/lprof-devel/files/patch-src-ICCtoIT8-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-ICCtoIT8-CMakeLists.txt deleted file mode 100644 index a5bfe89dc3d9..000000000000 --- a/graphics/lprof-devel/files/patch-src-ICCtoIT8-CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- src/ICCtoIT8/CMakeLists.txt 2008-02-19 18:02:10.000000000 -0300 -+++ src/ICCtoIT8/CMakeLists.txt 2012-05-01 10:37:22.000000000 -0300 -@@ -7,9 +7,11 @@ ADD_EXECUTABLE(icc2it8 - ${ICC2IT8_SOURCES} - ) - --SET_DIRECTORY_PROPERTIES( -- PROPERTIES -- INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/lcms/include;${CMAKE_SOURCE_DIR}/src/liblprof;${ARGYLL_INCLUDE_DIRS}" -+INCLUDE_DIRECTORIES( -+ BEFORE -+ ${CMAKE_SOURCE_DIR}/src/lcms/include -+ ${CMAKE_SOURCE_DIR}/src/liblprof -+ ${ARGYLL_INCLUDE_DIRS} - ) - - TARGET_LINK_LIBRARIES(icc2it8 liblprof lcmslocal ${COMMON_PLATFORM_LIBS}) diff --git a/graphics/lprof-devel/files/patch-src-argyll-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-argyll-CMakeLists.txt deleted file mode 100644 index 613187fee31f..000000000000 --- a/graphics/lprof-devel/files/patch-src-argyll-CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ ---- src/argyll/CMakeLists.txt 2008-02-19 18:02:10.000000000 -0300 -+++ src/argyll/CMakeLists.txt 2012-05-01 11:02:19.000000000 -0300 -@@ -5,9 +5,11 @@ ENDFOREACH(argyll_inc_dir) - - SET(ARGYLL_INCLUDE_DIRS "${ARGYLL_INCLUDE_DIRS}" CACHE PATH "Argyll cms include directories" FORCE) - --SET_DIRECTORY_PROPERTIES( -- PROPERTIES -- INCLUDE_DIRECTORIES "${ARGYLL_INCLUDE_DIRS};${LIBUSB_INCLUDE_DIR};${CMAKE_SOURCE_DIR}/src/moncalqt;${WINDDK_INCLUDE_DIR}" -+INCLUDE_DIRECTORIES( -+ BEFORE -+ ${ARGYLL_INCLUDE_DIRS} -+ ${LIBUSB_INCLUDE_DIR} -+ ${CMAKE_SOURCE_DIR}/src/moncalqt - ) - - SET(ARGYLL_SOURCES -@@ -83,3 +83,21 @@ - PROPERTIES - COMPILE_FLAGS "${argyll_flags}" - ) -+ -+SET(SPYD2ENLPROF_SOURCES -+ spectro/vinflate.c -+ spectro/spyd2en.c -+) -+ -+ADD_EXECUTABLE(spyd2enlprof -+ ${SPYD2ENLPROF_SOURCES} -+) -+ -+TARGET_LINK_LIBRARIES(spyd2enlprof argyll lcmslocal ${COMMON_PLATFORM_LIBS}) # liblprof lcmslocal ${COMMON_PLATFORM_LIBS}) -+ -+INSTALL( -+ TARGETS spyd2enlprof -+ RUNTIME DESTINATION ${BINDIR} -+ LIBRARY DESTINATION ${DYNLIBDIR} -+ ARCHIVE DESTINATION ${STATICLIBDIR} -+) diff --git a/graphics/lprof-devel/files/patch-src-argyll-spectro-unixio.c b/graphics/lprof-devel/files/patch-src-argyll-spectro-unixio.c deleted file mode 100644 index 0561d219f1ea..000000000000 --- a/graphics/lprof-devel/files/patch-src-argyll-spectro-unixio.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/argyll/spectro/unixio.c.orig 2008-02-20 00:02:24.000000000 +0300 -+++ src/argyll/spectro/unixio.c 2009-03-07 21:19:48.000000000 +0300 -@@ -35,6 +35,7 @@ - #include "insttypes.h" - #include "icoms.h" - #include "usbio.h" -+#include <dirent.h> - - #undef DEBUG - -@@ -585,9 +586,8 @@ - break; - - if (!( -- ( strncmp(de->d_name, "ttyS", 4) == 0 -- && de->d_name[4] >= '0' && de->d_name[4] <= '9') -- || ( strncmp(de->d_name, "ttyUSB", 5) == 0) -+ (strncmp(de->d_name, "cuad", 4) == 0 || strncmp(de->d_name, "cuaU", 4) == 0) && -+ strstr(de->d_name, ".init") == 0 && strstr(de->d_name, ".lock") == 0 - )) - continue; - diff --git a/graphics/lprof-devel/files/patch-src-argyll-spectro-usbio.c b/graphics/lprof-devel/files/patch-src-argyll-spectro-usbio.c deleted file mode 100644 index 9ee392c2e375..000000000000 --- a/graphics/lprof-devel/files/patch-src-argyll-spectro-usbio.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/argyll/spectro/usbio.c.orig 2009-03-07 21:18:13.000000000 +0300 -+++ src/argyll/spectro/usbio.c 2009-03-07 21:18:41.000000000 +0300 -@@ -20,6 +20,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <unistd.h> - #include <time.h> - #include <signal.h> - #if defined(UNIX) diff --git a/graphics/lprof-devel/files/patch-src-lcms-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-lcms-CMakeLists.txt deleted file mode 100644 index 141efe565674..000000000000 --- a/graphics/lprof-devel/files/patch-src-lcms-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- src/lcms/CMakeLists.txt 2008-02-19 18:02:38.000000000 -0300 -+++ src/lcms/CMakeLists.txt 2012-05-01 10:36:07.000000000 -0300 -@@ -1,8 +1,6 @@ --# Note that this will override the basic include path, which we want since there might be a stock --# lcms.h in the OS. --SET_DIRECTORY_PROPERTIES( -- PROPERTIES -- INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include" -+INCLUDE_DIRECTORIES( -+ BEFORE -+ ${CMAKE_CURRENT_SOURCE_DIR}/include - ) - - SET(LCMSLOCAL_SOURCES diff --git a/graphics/lprof-devel/files/patch-src-liblprof-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-liblprof-CMakeLists.txt deleted file mode 100644 index 21efa7bf032c..000000000000 --- a/graphics/lprof-devel/files/patch-src-liblprof-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- src/liblprof/CMakeLists.txt 2008-02-19 18:02:38.000000000 -0300 -+++ src/liblprof/CMakeLists.txt 2012-05-01 10:35:39.000000000 -0300 -@@ -18,7 +18,9 @@ ADD_LIBRARY(liblprof - ${LIBLPROF_SOURCES} - ) - --SET_DIRECTORY_PROPERTIES( -- PROPERTIES -- INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/lcms/include;${ARGYLL_INCLUDE_DIRS}" -+INCLUDE_DIRECTORIES( -+ BEFORE -+ ${CMAKE_SOURCE_DIR}/src/lcms/include -+ ${ARGYLL_INCLUDE_DIRS} - ) -+ diff --git a/graphics/lprof-devel/files/patch-src-libqtlcmswidgets-lprofgauge.h b/graphics/lprof-devel/files/patch-src-libqtlcmswidgets-lprofgauge.h deleted file mode 100644 index 6a30db004ddd..000000000000 --- a/graphics/lprof-devel/files/patch-src-libqtlcmswidgets-lprofgauge.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libqtlcmswidgets/lprofgauge.h.orig 2008-02-20 00:02:39.000000000 +0300 -+++ src/libqtlcmswidgets/lprofgauge.h 2008-05-24 05:07:17.000000000 +0400 -@@ -58,7 +58,6 @@ - - #include <Qt> - #include <QWidget> --#include <QtDesigner/QDesignerExportWidget> - - - class QColor; diff --git a/graphics/lprof-devel/files/patch-src_lprofqt_config.cpp b/graphics/lprof-devel/files/patch-src_lprofqt_config.cpp deleted file mode 100644 index 7142449caa50..000000000000 --- a/graphics/lprof-devel/files/patch-src_lprofqt_config.cpp +++ /dev/null @@ -1,20 +0,0 @@ -The function get_QTDIR reads the environment variable 'QTDIR'. Which is not set -most of the time. So define a sensible fallback value, and return that one in -this case. - -This should help the program find the assistant binary, without going over -qtchooser (and requiring to set QT_SELECT). - ---- src/lprofqt/config.cpp.orig 2017-02-04 19:46:56 UTC -+++ src/lprofqt/config.cpp -@@ -72,7 +72,9 @@ QString get_QTDIR() - { - // qDebug(QString::fromLocal8Bit("get_home_dir")); - const char* qtdir= "QTDIR"; -- return QString::fromLocal8Bit(getenv(qtdir)); -+ const QString fallback = "%%QT_ARCHDIR%%"; -+ QString env_qtdir = QString::fromLocal8Bit(getenv(qtdir)); -+ return (env_qtdir.isEmpty() ? fallback : env_qtdir); - } - - void init_env() diff --git a/graphics/lprof-devel/files/patch-src_lprofqt_imageitem.cpp b/graphics/lprof-devel/files/patch-src_lprofqt_imageitem.cpp deleted file mode 100644 index 91590ed35ed1..000000000000 --- a/graphics/lprof-devel/files/patch-src_lprofqt_imageitem.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/lprofqt/imageitem.cpp.orig 2008-03-06 21:18:58 UTC -+++ src/lprofqt/imageitem.cpp -@@ -174,11 +174,11 @@ void ImageItem::Reload(QString ImageFile - - image_file_name = ImageFile; - QString pixtype = QString::fromLocal8Bit(image_data->getPixelType()); -- int16lprof = (pixtype.contains(QString::fromLocal8Bit("INT16")) > 0); -- int32lprof = (pixtype.contains(QString::fromLocal8Bit("INT32")) > 0); -- uint8lprof = (pixtype.contains(QString::fromLocal8Bit("UINT8")) > 0); -- fltpixlprof = (pixtype.contains(QString::fromLocal8Bit("FLOAT")) > 0); -- dblpixlprof = (pixtype.contains(QString::fromLocal8Bit("DOUBLE")) > 0); -+ int16lprof = pixtype.contains(QString::fromLocal8Bit("INT16")); -+ int32lprof = pixtype.contains(QString::fromLocal8Bit("INT32")); -+ uint8lprof = pixtype.contains(QString::fromLocal8Bit("UINT8")); -+ fltpixlprof = pixtype.contains(QString::fromLocal8Bit("FLOAT")); -+ dblpixlprof = pixtype.contains(QString::fromLocal8Bit("DOUBLE")); - - // try again - vigra::DRGBImage in(image_data->width(), image_data->height()); |