From cc89fc0731d82340d0001da001cf54aa8485b8a5 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sat, 15 Jun 2013 18:01:05 +0000 Subject: [PATCH] Update to Rawtherapee 4.0.11. New features, faster, requires GCC 4.6+. This should fix the issues mentioned in the PRs given below, in particular, it should do away with the need for libmap.conf hacks for libgcc_s, libgomp, libobjc, libssp, libstdc++. (the Makefile as I took it already set the linker's -rpath, and patch-CMakeLists.txt ensures CMake keeps it during "make install"). ChangeLog 4.0.10: http://rawtherapee.com/blog/rawtherapee-4.0.10-released ChangeLog 4.0.11: http://rawtherapee.com/blog/rawtherapee-4.0.11-released PR: ports/171079 PR: ports/178206 --- graphics/rawtherapee/Makefile | 7 +- graphics/rawtherapee/distinfo | 4 +- .../files/patch-AboutThisBuild.cmake | 54 ++++---- .../rawtherapee/files/patch-CMakeLists.txt | 46 ++----- graphics/rawtherapee/pkg-plist | 124 +++++++++++++++--- 5 files changed, 147 insertions(+), 88 deletions(-) diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index d8e1071f9cc3..0f22a8007c96 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rawtherapee -PORTVERSION= 4.0.9 +PORTVERSION= 4.0.11 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -24,6 +24,8 @@ MAKE_JOBS_SAFE= yes USE_XZ= yes USE_GNOME= gtk20 glib20 USE_LDCONFIG= yes +# base GCC and clang in 9.1-RELEASE are insufficient: +USE_GCC= 4.6+ CFLAGS+= -I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS} CXXFLAGS+= -I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} @@ -39,6 +41,7 @@ CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ SUB_FILES= rawtherapee SUB_LIST= RTDIR="${RTDIR}" INSTALLS_ICONS= yes +MAN1= rawtherapee.1 RTDIR= ${PREFIX}/libdata/${PORTNAME} @@ -50,6 +53,8 @@ post-patch: @${REINPLACE_CMD} -e 's###g' \ ${WRKSRC}/rtgui/darkframe.h ${WRKSRC}/rtgui/flatfield.h \ ${WRKSRC}/rtgui/icmpanel.h + @${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \ + ${WRKSRC}/CMakeLists.txt .include diff --git a/graphics/rawtherapee/distinfo b/graphics/rawtherapee/distinfo index 9fb1ff664bf8..fe6bbd70a129 100644 --- a/graphics/rawtherapee/distinfo +++ b/graphics/rawtherapee/distinfo @@ -1,2 +1,2 @@ -SHA256 (rawtherapee-4.0.9.tar.xz) = 4ad49b5d3aae9a178b1cfa5efca653982f0a52763ddd37f89500e8fedfb187d2 -SIZE (rawtherapee-4.0.9.tar.xz) = 40201920 +SHA256 (rawtherapee-4.0.11.tar.xz) = 40401495ea5a693b9649f9b4fb101953cbaf6bc5fe01b81dd2ab30531afe567b +SIZE (rawtherapee-4.0.11.tar.xz) = 14828520 diff --git a/graphics/rawtherapee/files/patch-AboutThisBuild.cmake b/graphics/rawtherapee/files/patch-AboutThisBuild.cmake index 0f8c407c8c0c..ce922b402af9 100644 --- a/graphics/rawtherapee/files/patch-AboutThisBuild.cmake +++ b/graphics/rawtherapee/files/patch-AboutThisBuild.cmake @@ -1,31 +1,27 @@ ---- ./AboutThisBuild.cmake.orig 2012-06-03 19:56:20.000000000 +0400 -+++ ./AboutThisBuild.cmake 2012-08-07 15:18:18.000000000 +0400 -@@ -8,28 +8,9 @@ - find_file(HG_CMD hg) - set (SHELL "/bin/bash") - else (WIN32) # Linux -- find_file(HG_CMD hg) - set (SHELL "/bin/bash") - endif (WIN32) +--- ./AboutThisBuild.cmake.orig 2013-05-29 16:29:36.000000000 +0200 ++++ ./AboutThisBuild.cmake 2013-06-15 19:16:41.000000000 +0200 +@@ -11,24 +11,9 @@ + find_file(HG_CMD hg) + set (SHELL "/bin/bash") + else (WIN32) # Linux +- find_file(HG_CMD hg) + set (SHELL "/bin/bash") + endif (WIN32) --# the hg command is looked for again, at build time --if (HG_CMD STREQUAL HG_CMD-NOTFOUND) -- message(FATAL_ERROR "hg command not found!") --else (HG_CMD STREQUAL HG_CMD-NOTFOUND) -- message(STATUS "hg command found: ${HG_CMD}") --endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) +- # Fail if Mercurial is not installed +- if (HG_CMD STREQUAL HG_CMD-NOTFOUND) +- message(FATAL_ERROR "hg command not found!") +- else (HG_CMD STREQUAL HG_CMD-NOTFOUND) +- message(STATUS "hg command found: ${HG_CMD}") +- endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) - --set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt") --# there should be a better way of getting the compiler + compiler version, not restrained to Gcc --execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE) --if (CACHE_NAME_SUFFIX STREQUAL "") -- execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE) --endif () -- - # build version.h from template - configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h) - # build AboutThisBuild.txt from template +- execute_process(COMMAND ${HG_CMD} -R "${PROJECT_SOURCE_DIR}" branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) +- execute_process(COMMAND ${HG_CMD} -R "${PROJECT_SOURCE_DIR}" parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +- execute_process(COMMAND ${HG_CMD} -R "${PROJECT_SOURCE_DIR}" parents --template={node|short} WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE) +- execute_process(COMMAND ${HG_CMD} -R "${PROJECT_SOURCE_DIR}" parents --template={latesttagdistance} WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE) +- if (CACHE_NAME_SUFFIX STREQUAL "") +- execute_process(COMMAND ${HG_CMD} -R "${PROJECT_SOURCE_DIR}" parents --template={latesttag} WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE) +- endif (CACHE_NAME_SUFFIX STREQUAL "") + else (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) + include("${PROJECT_SOURCE_DIR}/ReleaseInfo.cmake") + endif (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) diff --git a/graphics/rawtherapee/files/patch-CMakeLists.txt b/graphics/rawtherapee/files/patch-CMakeLists.txt index 89a835f3e29b..65b0f3627f70 100644 --- a/graphics/rawtherapee/files/patch-CMakeLists.txt +++ b/graphics/rawtherapee/files/patch-CMakeLists.txt @@ -1,37 +1,13 @@ ---- ./CMakeLists.txt.orig 2012-01-31 05:00:05.000000000 +0400 -+++ ./CMakeLists.txt 2012-03-29 19:28:04.000000000 +0400 -@@ -230,7 +230,6 @@ - -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Windows.cmake - COMMENT "Creating the about file" - ) -- find_file(HG_CMD hg.exe HINTS ENV Path PATH_SUFFIXES ../) - - elseif (APPLE) - -@@ -250,7 +249,6 @@ - -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Apple.cmake - COMMENT "Creating the about file" - ) -- find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin") - find_file(HG_CMD hg) - - else (WIN32) -@@ -271,18 +269,11 @@ - -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Linux.cmake - COMMENT "Creating the about file" - ) -- find_file(HG_CMD hg) - - endif (WIN32) - - add_dependencies(AboutFile Debug Release MinSizeRel RelWithDebInfo) - -- if (HG_CMD STREQUAL HG_CMD-NOTFOUND) -- message(FATAL_ERROR "hg command not found!") -- else (HG_CMD STREQUAL HG_CMD-NOTFOUND) -- message(STATUS "hg command found: ${HG_CMD}") -- endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) -- - endif (AUTOMATED_BUILD_SYSTEM) +# This is required so that the RPATH information for libgcc/libgomp is +# not stripped during CMake's install phase: -- mandree + +--- ./CMakeLists.txt.orig 2013-06-15 19:16:41.000000000 +0200 ++++ ./CMakeLists.txt 2013-06-15 19:17:02.000000000 +0200 +@@ -6,6 +6,7 @@ + endif (WIN32) + PROJECT(RawTherapee) ++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + # the default target is 'Debug' + if (CMAKE_BUILD_TYPE STREQUAL "") diff --git a/graphics/rawtherapee/pkg-plist b/graphics/rawtherapee/pkg-plist index 43e8569ab52d..0b6ead0353ba 100644 --- a/graphics/rawtherapee/pkg-plist +++ b/graphics/rawtherapee/pkg-plist @@ -15,6 +15,7 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/dcpprofiles/Canon EOS 40D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 450D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 550D.dcp +%%DATADIR%%/dcpprofiles/Canon EOS 5D Mark III.dcp %%DATADIR%%/dcpprofiles/Canon EOS 5D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 7D.dcp %%DATADIR%%/dcpprofiles/Canon EOS D60.dcp @@ -24,6 +25,7 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/dcpprofiles/Canon EOS-1D Mark III.dcp %%DATADIR%%/dcpprofiles/Canon PowerShot G10.dcp %%DATADIR%%/dcpprofiles/Canon PowerShot G12.dcp +%%DATADIR%%/dcpprofiles/Leaf Aptus 75.dcp %%DATADIR%%/dcpprofiles/Nikon D200.dcp %%DATADIR%%/dcpprofiles/Nikon D300.dcp %%DATADIR%%/dcpprofiles/Nikon D3000.dcp @@ -33,13 +35,19 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/dcpprofiles/Nikon D5100.dcp %%DATADIR%%/dcpprofiles/Nikon D700.dcp %%DATADIR%%/dcpprofiles/Nikon D7000.dcp +%%DATADIR%%/dcpprofiles/Nikon D800.dcp %%DATADIR%%/dcpprofiles/Olympus E-1.dcp +%%DATADIR%%/dcpprofiles/Olympus E-510.dcp +%%DATADIR%%/dcpprofiles/Olympus E-520.dcp +%%DATADIR%%/dcpprofiles/Olympus E-M5.dcp %%DATADIR%%/dcpprofiles/Olympus E-P2.dcp +%%DATADIR%%/dcpprofiles/Olympus XZ-1.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-FZ150.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-FZ35.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-FZ38.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-G1.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-G3.dcp +%%DATADIR%%/dcpprofiles/Panasonic DMC-G5.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-GH1.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-GH2.dcp %%DATADIR%%/dcpprofiles/Pentax K10D.dcp @@ -92,10 +100,6 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Chanmixer-RB.png %%DATADIR%%/images/Chanmixer-RG.png %%DATADIR%%/images/Chanmixer-RR.png -%%DATADIR%%/images/Dark/.gtk-undo-ltr-small.png -%%DATADIR%%/images/Dark/.gtk-undo-ltr.png -%%DATADIR%%/images/Dark/.gtk-undo-rtl-small.png -%%DATADIR%%/images/Dark/.gtk-undo-rtl.png %%DATADIR%%/images/Dark/actions/PanelEnding.png %%DATADIR%%/images/Dark/actions/beforeafter.png %%DATADIR%%/images/Dark/actions/cglabel0.png @@ -174,6 +178,10 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Dark/actions/histBarg.png %%DATADIR%%/images/Dark/actions/histBlue.png %%DATADIR%%/images/Dark/actions/histBlueg.png +%%DATADIR%%/images/Dark/actions/histChro.png +%%DATADIR%%/images/Dark/actions/histChrog.png +%%DATADIR%%/images/Dark/actions/histFull.png +%%DATADIR%%/images/Dark/actions/histFullg.png %%DATADIR%%/images/Dark/actions/histGreen.png %%DATADIR%%/images/Dark/actions/histGreeng.png %%DATADIR%%/images/Dark/actions/histRaw.png @@ -192,6 +200,9 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Dark/actions/lock-on.png %%DATADIR%%/images/Dark/actions/media-usb.png %%DATADIR%%/images/Dark/actions/meta.png +%%DATADIR%%/images/Dark/actions/nav-next.png +%%DATADIR%%/images/Dark/actions/nav-prev.png +%%DATADIR%%/images/Dark/actions/nav-sync.png %%DATADIR%%/images/Dark/actions/new-detail-window.png %%DATADIR%%/images/Dark/actions/openhand.png %%DATADIR%%/images/Dark/actions/panel-to-bottom.png @@ -201,6 +212,12 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Dark/actions/popuparrow.png %%DATADIR%%/images/Dark/actions/previewmodeB-off.png %%DATADIR%%/images/Dark/actions/previewmodeB-on.png +%%DATADIR%%/images/Dark/actions/previewmodeBC0-off.png +%%DATADIR%%/images/Dark/actions/previewmodeBC0-on.png +%%DATADIR%%/images/Dark/actions/previewmodeBC1-off.png +%%DATADIR%%/images/Dark/actions/previewmodeBC1-on.png +%%DATADIR%%/images/Dark/actions/previewmodeBC2-off.png +%%DATADIR%%/images/Dark/actions/previewmodeBC2-on.png %%DATADIR%%/images/Dark/actions/previewmodeF-off.png %%DATADIR%%/images/Dark/actions/previewmodeF-on.png %%DATADIR%%/images/Dark/actions/previewmodeG-off.png @@ -213,6 +230,8 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Dark/actions/processing-play.png %%DATADIR%%/images/Dark/actions/processing-thumbnail.png %%DATADIR%%/images/Dark/actions/processing.png +%%DATADIR%%/images/Dark/actions/profile-filled.png +%%DATADIR%%/images/Dark/actions/profile-partial.png %%DATADIR%%/images/Dark/actions/rated.png %%DATADIR%%/images/Dark/actions/ratednot.png %%DATADIR%%/images/Dark/actions/ratednotg.png @@ -266,10 +285,6 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Dark/places/gtk-directory.png %%DATADIR%%/images/Dark/places/user-desktop.png %%DATADIR%%/images/Dark/places/user-home.png -%%DATADIR%%/images/Light/.gtk-undo-ltr-small.png -%%DATADIR%%/images/Light/.gtk-undo-ltr.png -%%DATADIR%%/images/Light/.gtk-undo-rtl-small.png -%%DATADIR%%/images/Light/.gtk-undo-rtl.png %%DATADIR%%/images/Light/actions/PanelEnding.png %%DATADIR%%/images/Light/actions/beforeafter.png %%DATADIR%%/images/Light/actions/cglabel0.png @@ -348,6 +363,10 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Light/actions/histBarg.png %%DATADIR%%/images/Light/actions/histBlue.png %%DATADIR%%/images/Light/actions/histBlueg.png +%%DATADIR%%/images/Light/actions/histChro.png +%%DATADIR%%/images/Light/actions/histChrog.png +%%DATADIR%%/images/Light/actions/histFull.png +%%DATADIR%%/images/Light/actions/histFullg.png %%DATADIR%%/images/Light/actions/histGreen.png %%DATADIR%%/images/Light/actions/histGreeng.png %%DATADIR%%/images/Light/actions/histRaw.png @@ -366,6 +385,9 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Light/actions/lock-on.png %%DATADIR%%/images/Light/actions/media-usb.png %%DATADIR%%/images/Light/actions/meta.png +%%DATADIR%%/images/Light/actions/nav-next.png +%%DATADIR%%/images/Light/actions/nav-prev.png +%%DATADIR%%/images/Light/actions/nav-sync.png %%DATADIR%%/images/Light/actions/new-detail-window.png %%DATADIR%%/images/Light/actions/openhand.png %%DATADIR%%/images/Light/actions/panel-to-bottom.png @@ -375,6 +397,12 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Light/actions/popuparrow.png %%DATADIR%%/images/Light/actions/previewmodeB-off.png %%DATADIR%%/images/Light/actions/previewmodeB-on.png +%%DATADIR%%/images/Light/actions/previewmodeBC0-off.png +%%DATADIR%%/images/Light/actions/previewmodeBC0-on.png +%%DATADIR%%/images/Light/actions/previewmodeBC1-off.png +%%DATADIR%%/images/Light/actions/previewmodeBC1-on.png +%%DATADIR%%/images/Light/actions/previewmodeBC2-off.png +%%DATADIR%%/images/Light/actions/previewmodeBC2-on.png %%DATADIR%%/images/Light/actions/previewmodeF-off.png %%DATADIR%%/images/Light/actions/previewmodeF-on.png %%DATADIR%%/images/Light/actions/previewmodeG-off.png @@ -387,6 +415,8 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/images/Light/actions/processing-play.png %%DATADIR%%/images/Light/actions/processing-thumbnail.png %%DATADIR%%/images/Light/actions/processing.png +%%DATADIR%%/images/Light/actions/profile-filled.png +%%DATADIR%%/images/Light/actions/profile-partial.png %%DATADIR%%/images/Light/actions/rated.png %%DATADIR%%/images/Light/actions/ratednot.png %%DATADIR%%/images/Light/actions/ratednotg.png @@ -567,13 +597,14 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/languages/Czech %%DATADIR%%/languages/Dansk %%DATADIR%%/languages/Deutsch -%%DATADIR%%/languages/English +%%DATADIR%%/languages/English (UK) +%%DATADIR%%/languages/English (US) %%DATADIR%%/languages/Espanol %%DATADIR%%/languages/Euskara %%DATADIR%%/languages/Francais %%DATADIR%%/languages/Greek %%DATADIR%%/languages/Hebrew -%%DATADIR%%/languages/Italian +%%DATADIR%%/languages/Italiano %%DATADIR%%/languages/Japanese %%DATADIR%%/languages/LICENSE %%DATADIR%%/languages/Latvian @@ -593,19 +624,70 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/languages/Turkish %%DATADIR%%/languages/default %%DATADIR%%/options -%%DATADIR%%/profiles/BW-1.pp3 -%%DATADIR%%/profiles/BW-2.pp3 -%%DATADIR%%/profiles/BW-3.pp3 -%%DATADIR%%/profiles/BW-4.pp3 -%%DATADIR%%/profiles/Default-ISO-High.pp3 -%%DATADIR%%/profiles/Default-ISO-Medium.pp3 +%%DATADIR%%/profiles/BW 1.pp3 +%%DATADIR%%/profiles/BW 2.pp3 +%%DATADIR%%/profiles/BW 3.pp3 +%%DATADIR%%/profiles/BW 4.pp3 +%%DATADIR%%/profiles/Deep Shadows.pp3 +%%DATADIR%%/profiles/Default ISO High.pp3 +%%DATADIR%%/profiles/Default ISO Medium.pp3 %%DATADIR%%/profiles/Default.pp3 -%%DATADIR%%/profiles/Highkey-1.pp3 -%%DATADIR%%/profiles/Natural-1.pp3 -%%DATADIR%%/profiles/Natural-2.pp3 +%%DATADIR%%/profiles/Equilibrated.pp3 +%%DATADIR%%/profiles/Faded Amber 1 TM Bright.pp3 +%%DATADIR%%/profiles/Faded Amber 1 TM.pp3 +%%DATADIR%%/profiles/Faded Amber 1.pp3 +%%DATADIR%%/profiles/Faded Blue 1 TM Bright.pp3 +%%DATADIR%%/profiles/Faded Blue 1 TM.pp3 +%%DATADIR%%/profiles/Faded Blue 1.pp3 +%%DATADIR%%/profiles/Faded Blue Pink TM.pp3 +%%DATADIR%%/profiles/Faded Blue Pink.pp3 +%%DATADIR%%/profiles/Faded Chocolate 1 TM Bright.pp3 +%%DATADIR%%/profiles/Faded Chocolate 2 TM Bright.pp3 +%%DATADIR%%/profiles/Faded Golden 1.pp3 +%%DATADIR%%/profiles/Faded Golden 2.pp3 +%%DATADIR%%/profiles/Faded Green 1 TM Bright.pp3 +%%DATADIR%%/profiles/Faded Green 1 TM.pp3 +%%DATADIR%%/profiles/Faded Green 1.pp3 +%%DATADIR%%/profiles/Faded Green 2.pp3 +%%DATADIR%%/profiles/Faded Green 3.pp3 +%%DATADIR%%/profiles/Faded Neutral TM.pp3 +%%DATADIR%%/profiles/Faded Neutral.pp3 +%%DATADIR%%/profiles/Faded Purple 1 TM Bright.pp3 +%%DATADIR%%/profiles/Faded Purple 1 TM.pp3 +%%DATADIR%%/profiles/Faded Purple 1.pp3 +%%DATADIR%%/profiles/Faded Purple 2 TM.pp3 +%%DATADIR%%/profiles/Faded Purple 2.pp3 +%%DATADIR%%/profiles/Faded Teal Orange TM Bright.pp3 +%%DATADIR%%/profiles/Faded Teal Orange TM.pp3 +%%DATADIR%%/profiles/Faded Teal Orange.pp3 +%%DATADIR%%/profiles/Faded Warm 1 TM Bright.pp3 +%%DATADIR%%/profiles/Faded Warm 1 TM.pp3 +%%DATADIR%%/profiles/Faded Warm 1.pp3 +%%DATADIR%%/profiles/Faded Warm 2.pp3 +%%DATADIR%%/profiles/Faded Warm 3.pp3 +%%DATADIR%%/profiles/High-Key.pp3 +%%DATADIR%%/profiles/Natural 1.pp3 +%%DATADIR%%/profiles/Natural 2.pp3 %%DATADIR%%/profiles/Neutral.pp3 -%%DATADIR%%/profiles/Punchy-1.pp3 -%%DATADIR%%/profiles/Punchy-2.pp3 +%%DATADIR%%/profiles/Pop 1.pp3 +%%DATADIR%%/profiles/Pop 2 L.pp3 +%%DATADIR%%/profiles/Pop 3 Skin.pp3 +%%DATADIR%%/profiles/Pop 4 BW.pp3 +%%DATADIR%%/profiles/Portrait Lejto.pp3 +%%DATADIR%%/profiles/Portrait Smooth.pp3 +%%DATADIR%%/profiles/Punchy 1.pp3 +%%DATADIR%%/profiles/Punchy 2.pp3 +%%DATADIR%%/profiles/Skintones - Natural TM.pp3 +%%DATADIR%%/profiles/Skintones - Natural.pp3 +%%DATADIR%%/profiles/Skintones - Pale TM Bright.pp3 +%%DATADIR%%/profiles/Skintones - Pale TM.pp3 +%%DATADIR%%/profiles/Skintones - Pale.pp3 +%%DATADIR%%/profiles/Skintones - Soft Texture.pp3 +%%DATADIR%%/profiles/Skintones - Strong Texture.pp3 +%%DATADIR%%/profiles/Skintones - Studio TM.pp3 +%%DATADIR%%/profiles/Skintones - Studio.pp3 +%%DATADIR%%/profiles/Skintones - StudioBase 1 TM.pp3 +%%DATADIR%%/profiles/Skintones - StudioBase 1.pp3 %%DATADIR%%/sounds/BatchComplete.wav %%DATADIR%%/sounds/Empty.wav %%DATADIR%%/sounds/ProcessComplete.wav