Hello community, here is the log from the commit of package dcraw for openSUSE:Factory checked in at 2011-12-27 18:34:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcraw (Old) and /work/SRC/openSUSE:Factory/.dcraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcraw", Maintainer is "posta...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dcraw/dcraw.changes 2011-10-10 00:48:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dcraw.new/dcraw.changes 2011-12-27 18:34:57.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Dec 23 18:52:51 UTC 2011 - asterios.dra...@gmail.com + +- Update to version 9.12: + dcraw - revision 1.446 + * Support the Canon S100, Nikon 1 J1 and V1, Panasonic GX1, Fuji X10, and + Samsung NX200 with color matrices from DNG Converter 6.6. + +------------------------------------------------------------------- Old: ---- dcraw-9.11.tar.gz New: ---- dcraw-9.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcraw.spec ++++++ --- /var/tmp/diff_new_pack.bsi6Dd/_old 2011-12-27 18:34:58.000000000 +0100 +++ /var/tmp/diff_new_pack.bsi6Dd/_new 2011-12-27 18:34:58.000000000 +0100 @@ -16,14 +16,13 @@ # - Name: dcraw -Version: 9.11 -Release: 1 -License: PERMISSIVE-OSI-COMPLIANT +Version: 9.12 +Release: 0 Summary: Raw Digital Photo Decoding -Url: http://www.cybercom.net/~dcoffin/dcraw/ +License: PERMISSIVE-OSI-COMPLIANT Group: Productivity/Graphics/Convertors +Url: http://www.cybercom.net/~dcoffin/dcraw/ Source0: http://www.cybercom.net/~dcoffin/dcraw/archive/%{name}-%{version}.tar.gz #*** NOTE: run "sh update_dcraw" to update to latest version of the following sources ("wget", "rcs" and "lynx" packages are required for the update). Source1: README @@ -54,6 +53,7 @@ Command line tools for raw digital photo decoding and processing. %lang_package + %prep %setup -q -n %{name} cp -a %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} . ++++++ README ++++++ --- /var/tmp/diff_new_pack.bsi6Dd/_old 2011-12-27 18:34:58.000000000 +0100 +++ /var/tmp/diff_new_pack.bsi6Dd/_new 2011-12-27 18:34:58.000000000 +0100 @@ -70,7 +70,7 @@ execute permission. * [16]dcraw.c -- decodes raw photos, extracts thumbnails, and displays metadata - Supports 426 cameras at last count. Compile with "gcc -o dcraw -O4 + Supports 438 cameras at last count. Compile with "gcc -o dcraw -O4 dcraw.c -lm -ljasper -ljpeg -llcms" or "gcc -o dcraw -O4 dcraw.c -lm -DNODEPS". Run with no arguments to see a usage message. Don't complain that 16-bit output is too dark -- read the [17]FAQ! @@ -426,6 +426,7 @@ * Canon PowerShot S70 * Canon PowerShot S90 * Canon PowerShot S95 + * Canon PowerShot S100 * Canon PowerShot SX1 IS * Canon PowerShot SX110 IS (CHDK hack) * Canon PowerShot SX120 IS (CHDK hack) @@ -509,6 +510,7 @@ * Fuji FinePix HS20EXR * Fuji FinePix F550EXR * Fuji FinePix X100 + * Fuji X10 * Fuji IS-1 * Hasselblad CFV * Hasselblad H3D @@ -632,6 +634,8 @@ * Nikon D5000 * Nikon D5100 * Nikon D7000 + * Nikon 1 J1 + * Nikon 1 V1 * Nikon E700 ("DIAG RAW" hack) * Nikon E800 ("DIAG RAW" hack) * Nikon E880 ("DIAG RAW" hack) @@ -715,6 +719,7 @@ * Panasonic DMC-GF3 * Panasonic DMC-GH1 * Panasonic DMC-GH2 + * Panasonic DMC-GX1 * Panasonic DMC-L1 * Panasonic DMC-L10 * Panasonic DMC-LC1 @@ -763,6 +768,7 @@ * Samsung NX10 * Samsung NX11 * Samsung NX100 + * Samsung NX200 * Samsung WB550 * Samsung WB2000 * Samsung S85 (hacked) ++++++ dcraw-9.11.tar.gz -> dcraw-9.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw.c new/dcraw/dcraw.c --- old/dcraw/dcraw.c 2011-10-07 03:00:37.000000000 +0200 +++ new/dcraw/dcraw.c 2011-12-21 02:30:35.000000000 +0100 @@ -19,11 +19,11 @@ *If you have not modified dcraw.c in any way, a link to my homepage qualifies as "full source code". - $Revision: 1.445 $ - $Date: 2011/10/07 01:00:37 $ + $Revision: 1.446 $ + $Date: 2011/12/21 01:21:23 $ */ -#define DCRAW_VERSION "9.11" +#define DCRAW_VERSION "9.12" #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -3834,7 +3834,8 @@ } } if (filters && colors == 3) { - if ((mix_green = four_color_rgb)) colors++; + if (four_color_rgb && colors++) + mix_green = !half_size; else { for (row = FC(1,0) >> 1; row < height; row+=2) for (col = FC(row,1) & 1; col < width; col+=2) @@ -6280,6 +6281,8 @@ { 12374,-5016,-1049,-1677,9902,2078,-83,852,4683 } }, { "Canon PowerShot S95", 0, 0, { 13440,-5896,-1279,-1236,9598,1931,-180,1001,4651 } }, + { "Canon PowerShot S100", 0, 0, + { 7968,-2565,-636,-2873,10697,2513,180,667,4211 } }, { "Canon PowerShot A470", 0, 0, /* DJC */ { 12513,-4407,-1242,-2680,10276,2405,-878,2215,4734 } }, { "Canon PowerShot A610", 0, 0, /* DJC */ @@ -6372,6 +6375,8 @@ { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, { "FUJIFILM FinePix X100", 0, 0, { 12161,-4457,-1069,-5034,12874,2400,-795,1724,6904 } }, + { "FUJIFILM X10", 0, 0, + { 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } }, { "Imacon Ixpress", 0, 0, /* DJC */ { 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } }, { "KODAK NC2000", 0, 0, @@ -6542,6 +6547,8 @@ { 11432,-3679,-1111,-3169,11239,2202,-791,1380,4455 } }, { "NIKON COOLPIX P7100", 0, 0, { 11053,-4269,-1024,-1976,10182,2088,-526,1263,4469 } }, + { "NIKON 1 ", 0, 0, + { 8994,-2667,-865,-4594,12324,2552,-699,1786,6260 } }, { "OLYMPUS C5050", 0, 0, { 10508,-3124,-1273,-6079,14294,1901,-1653,2306,6237 } }, { "OLYMPUS C5060", 0, 0, @@ -6660,7 +6667,7 @@ { 10976,-4029,-1141,-7918,15491,2600,-1670,2071,8246 } }, { "Panasonic DMC-FZ3", 143, 0, { 9938,-2780,-890,-4604,12393,2480,-1117,2304,4620 } }, - { "Panasonic DMC-FZ40", 143, 0, + { "Panasonic DMC-FZ4", 143, 0, { 13639,-5535,-1371,-1698,9633,2430,316,1152,4108 } }, { "Panasonic DMC-FZ50", 0, 0, { 7906,-2709,-594,-6231,13351,3220,-1922,2631,6537 } }, @@ -6698,6 +6705,8 @@ { 16197,-6146,-1761,-2393,10765,1869,366,2238,5248 } }, { "Panasonic DMC-FZ150", 143, 0xfff, { 11904,-4541,-1189,-2355,10899,1662,-296,1586,4289 } }, + { "LEICA V-LUX 3", 143, 0xfff, + { 11904,-4541,-1189,-2355,10899,1662,-296,1586,4289 } }, { "Panasonic DMC-FX150", 15, 0xfff, { 9082,-2907,-925,-6119,13377,3058,-1797,2641,5609 } }, { "Panasonic DMC-G10", 0, 0, @@ -6718,6 +6727,8 @@ { 6299,-1466,-532,-6535,13852,2969,-2331,3112,5984 } }, { "Panasonic DMC-GH2", 15, 0xf95, { 7780,-2410,-806,-3913,11724,2484,-1018,2390,5298 } }, + { "Panasonic DMC-GX1", 143, 0, + { 6763,-1919,-863,-3868,11515,2684,-1216,2387,5879 } }, { "Phase One H 20", 0, 0, /* DJC */ { 1313,1855,-109,-6715,15908,808,-327,1840,6020 } }, { "Phase One H 25", 0, 0, @@ -6736,7 +6747,9 @@ { 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } }, { "SAMSUNG EX1", 0, 0x3e00, { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, - { "SAMSUNG NX1", 0, 0, + { "SAMSUNG NX200", 0, 0xfff, + { 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } }, + { "SAMSUNG NX", 0, 0, /* NX5, NX10, NX11, NX100 */ { 10332,-3234,-1168,-6111,14639,1520,-1352,2647,8331 } }, { "SAMSUNG WB2000", 0, 0xfff, { 12093,-3557,-1155,-1000,9534,1733,-22,1787,4576 } }, @@ -6792,6 +6805,8 @@ { 6549,-1550,-436,-4880,12435,2753,-854,1868,6976 } }, { "SONY NEX-5", 128, 0, /* Adobe */ { 6549,-1550,-436,-4880,12435,2753,-854,1868,6976 } }, + { "SONY NEX-7", 128, 0, + { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, { "SONY SLT-A33", 128, 0, { 6069,-1221,-366,-5221,12779,2734,-1024,2066,6834 } }, { "SONY SLT-A35", 128, 0, @@ -7504,6 +7519,11 @@ top_margin = 12; left_margin = 192; goto canon_cr2; + } else if (is_canon && raw_width == 4160) { + height = 3048; + width = 4048; + top_margin = 11; + left_margin = 104; } else if (is_canon && raw_width == 4312) { top_margin = 18; left_margin = 22; @@ -7618,6 +7638,8 @@ filters = 0x94949494; if (model[9] == '7' && iso_speed >= 400) black = 255; + } else if (!strncmp(model,"1 ",2)) { + height -= 2; } else if (fsize == 1581060) { height = 963; width = 1287; @@ -7730,6 +7752,8 @@ width = 3262; left_margin = 34; } + if (!strcmp(model,"X10")) + filters = 0x16161616; if (fuji_layout) raw_width *= is_raw; if (load_raw == &CLASS fuji_load_raw) { fuji_width = width >> !fuji_layout; @@ -7831,6 +7855,12 @@ height -= top_margin = 8; width -= 2 * (left_margin = 8); load_flags = 32; + } else if (!strcmp(model,"NX200")) { + order = 0x4949; + height = 3662; + width = 5528; + top_margin = 2; + left_margin = 46; } else if (!strcmp(model,"EX1")) { order = 0x4949; height -= 20; ++++++ update_dcraw ++++++ --- /var/tmp/diff_new_pack.bsi6Dd/_old 2011-12-27 18:34:58.000000000 +0100 +++ /var/tmp/diff_new_pack.bsi6Dd/_new 2011-12-27 18:34:58.000000000 +0100 @@ -1,6 +1,7 @@ #! /bin/sh # Call this script to update dcraw files (except the main package) to latest version. +# "wget", "rcs" and "lynx" packages are required for the update wget -N http://www.cybercom.net/~dcoffin/dcraw/parse.c wget -N http://www.cybercom.net/~dcoffin/dcraw/fujiturn.c -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
