Accepting request 627249 from home:gladiac:branches:graphics
- Add patch libraw-Add-Sony-ILCE-7M3.patch * See https://github.com/LibRaw/LibRaw/pull/145 * The patch has been cut, the tarball from the download section doesn't match the git tag. dcraw/dcraw.c is totall different. - Use %license tag OBS-URL: https://build.opensuse.org/request/show/627249 OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=119
This commit is contained in:
Git OBS Bridge
parent
dbea602fbb
commit
61ceba12d2
64
libraw-Add-Sony-ILCE-7M3.patch
Normal file
64
libraw-Add-Sony-ILCE-7M3.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From a340f3d299f73b2ae25678f7b59fc2167d7c6fc1 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 4 May 2018 10:50:10 +0200
|
||||
Subject: [PATCH] Add Sony ILCE-7M3
|
||||
|
||||
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
||||
---
|
||||
dcraw/dcraw.c | 11 +++++++----
|
||||
internal/dcraw_common.cpp | 11 +++++++----
|
||||
2 files changed, 14 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp
|
||||
index 0a9afa2..80b91c4 100644
|
||||
--- a/internal/dcraw_common.cpp
|
||||
+++ b/internal/dcraw_common.cpp
|
||||
@@ -8331,7 +8331,7 @@ void CLASS setSonyBodyFeatures(unsigned id)
|
||||
{360, LIBRAW_FORMAT_APSC, LIBRAW_MOUNT_Sony_E, LIBRAW_SONY_ILCE, 0, 8, 0x0346, 0x01cd},
|
||||
{361, 0, 0, 0, 0, 0, 0xffff, 0xffff},
|
||||
{362, LIBRAW_FORMAT_FF, LIBRAW_MOUNT_Sony_E, LIBRAW_SONY_ILCE, 0, 9, 0x0320, 0x019f},
|
||||
- {363, 0, 0, 0, 0, 0, 0xffff, 0xffff},
|
||||
+ {363, LIBRAW_FORMAT_FF, LIBRAW_MOUNT_Sony_E, LIBRAW_SONY_ILCE, 0, 0, 0x0320, 0x019f},
|
||||
{364, LIBRAW_FORMAT_1INCH, LIBRAW_MOUNT_FixedLens, LIBRAW_SONY_DSC, LIBRAW_MOUNT_FixedLens, 8, 0x0346, 0xffff},
|
||||
{365, LIBRAW_FORMAT_1INCH, LIBRAW_MOUNT_FixedLens, LIBRAW_SONY_DSC, LIBRAW_MOUNT_FixedLens, 9, 0x0320, 0xffff},
|
||||
};
|
||||
@@ -8623,7 +8623,7 @@ void CLASS process_Sony_0x9050(uchar *buf, ushort len, unsigned id)
|
||||
parseSonyLensFeatures(SonySubstitution[buf[0x116]], SonySubstitution[buf[0x117]]);
|
||||
}
|
||||
|
||||
- if ((id == 347) || (id == 350) || (id == 354) || (id == 357) || (id == 358) || (id == 360) || (id == 362))
|
||||
+ if ((id == 347) || (id == 350) || (id == 354) || (id == 357) || (id == 358) || (id == 360) || (id == 362) || (id == 363))
|
||||
{
|
||||
if (len <= 0x8d)
|
||||
return;
|
||||
@@ -8687,7 +8687,7 @@ void CLASS process_Sony_0x9400(uchar *buf, ushort len, unsigned id)
|
||||
if (((bufx == 0x23) || (bufx == 0x24) || (bufx == 0x26)) && (len >= 0x1f))
|
||||
{ // 0x9400 'c' version
|
||||
|
||||
- if ((id == 358) || (id == 362) || (id == 365))
|
||||
+ if ((id == 358) || (id == 362) || (id == 363) || (id == 365))
|
||||
{
|
||||
imgdata.makernotes.sony.ShotNumberSincePowerUp = SonySubstitution[buf[0x0a]];
|
||||
}
|
||||
@@ -17094,6 +17094,8 @@ void CLASS adobe_coeff(const char *t_make, const char *t_model
|
||||
{ 6389,-1703,-378,-4562,12265,2587,-670,1489,6550 } },
|
||||
{ "Sony ILCE-7M2", 0, 0,
|
||||
{ 5271,-712,-347,-6153,13653,2763,-1601,2366,7242 } },
|
||||
+ { "Sony ILCE-7M3", 0, 0,
|
||||
+ { 7374,-2389,-551,-5435,13162,2519,-1006,1795,6552 } },
|
||||
{ "Sony ILCE-7SM2", 0, 0,
|
||||
{ 5838,-1430,-246,-3497,11477,2297,-748,1885,5778 } },
|
||||
{ "Sony ILCE-7S", 0, 0,
|
||||
@@ -17472,7 +17474,8 @@ void CLASS identify()
|
||||
{0x155, "DSC-RX100M4"}, {0x156, "DSC-RX10M2"}, {0x158, "DSC-RX1RM2"}, {0x15a, "ILCE-QX1"},
|
||||
{0x15b, "ILCE-7RM2"}, {0x15e, "ILCE-7SM2"}, {0x161, "ILCA-68"}, {0x162, "ILCA-99M2"},
|
||||
{0x163, "DSC-RX10M3"}, {0x164, "DSC-RX100M5"}, {0x165, "ILCE-6300"}, {0x166, "ILCE-9"},
|
||||
- {0x168, "ILCE-6500"}, {0x16a, "ILCE-7RM3"}, {0x16c, "DSC-RX0"}, {0x16d, "DSC-RX10M4"},
|
||||
+ {0x168, "ILCE-6500"}, {0x16a, "ILCE-7RM3"}, {0x16b, "ILCE-7M3"}, {0x16c, "DSC-RX0"},
|
||||
+ {0x16d, "DSC-RX10M4"},
|
||||
};
|
||||
|
||||
#ifdef LIBRAW_LIBRARY_BUILD
|
||||
--
|
||||
2.16.3
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 2 08:33:57 UTC 2018 - asn@cryptomilk.org
|
||||
|
||||
- Add patch libraw-Add-Sony-ILCE-7M3.patch
|
||||
* See https://github.com/LibRaw/LibRaw/pull/145
|
||||
* The patch has been cut, the tarball from the download section
|
||||
doesn't match the git tag. dcraw/dcraw.c is totall different.
|
||||
- Use %license tag
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 1 11:07:43 UTC 2018 - pgajdos@suse.com
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ Url: https://www.libraw.org/
|
||||
#Git-Clone: git://github.com/LibRaw/LibRaw
|
||||
Source: https://www.libraw.org/data/%tar_name-%version.tar.gz
|
||||
Patch0: libraw-CVE-2018-5813.patch
|
||||
Patch1: libraw-Add-Sony-ILCE-7M3.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libjasper-devel
|
||||
@ -95,8 +96,9 @@ This package contains static libraries that applications can use to build
|
||||
against LibRaw. LibRaw does not provide dynamic libraries.
|
||||
|
||||
%prep
|
||||
%setup -qn %tar_name-%version
|
||||
%setup -q -n %{tar_name}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
export CXXFLAGS="%optflags -fPIC -DUSE_ZLIB"
|
||||
@ -124,7 +126,8 @@ rm -rf %buildroot%_datadir/doc
|
||||
%_bindir/*
|
||||
|
||||
%files devel
|
||||
%doc Changelog.txt COPYRIGHT LICENSE.CDDL LICENSE.LGPL
|
||||
%doc Changelog.txt
|
||||
%license COPYRIGHT LICENSE.CDDL LICENSE.LGPL
|
||||
%doc manual
|
||||
%_includedir/%name/
|
||||
%_libdir/pkgconfig/*.pc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user