]> git.pld-linux.org Git - packages/CharLS.git/commitdiff
- new URLs, updated to 1.1.0 auto/th/CharLS-1.1.0-1
authorJakub Bogusz <qboosh@pld-linux.org>
Thu, 15 Sep 2016 16:10:59 +0000 (18:10 +0200)
committerJakub Bogusz <qboosh@pld-linux.org>
Thu, 15 Sep 2016 16:10:59 +0000 (18:10 +0200)
- removed obsolete patches

CharLS-add_cmake_install_target.patch [deleted file]
CharLS-add_sharedlib_soname.patch [deleted file]
CharLS-fix_tests.patch [deleted file]
CharLS.spec

diff --git a/CharLS-add_cmake_install_target.patch b/CharLS-add_cmake_install_target.patch
deleted file mode 100644 (file)
index bd96ffa..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8304f0d..88f0949 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,11 @@ SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3" )
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
- ENDIF(NOT CMAKE_BUILD_TYPE)
-+SET( charls_HEADERS "colortransform.h"  "context.h" "decoderstrategy.h"  "encoderstrategy.h"  "interface.h"
-+    "losslesstraits.h"  "scan.h"    "streams.h" "config.h"          "contextrunmode.h"  "defaulttraits.h"
-+    "header.h"           "lookuptable.h"  "processline.h"      "util.h" "publictypes.h"
-+)
-+
- OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
- SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
-@@ -21,3 +26,7 @@ add_library(CharLS header.cpp  interface.cpp  jpegls.cpp  )
- add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)
- target_link_libraries (charlstest CharLS)
-+# Installs the header files into the {build_dir}/include/libcharls directory
-+install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
-+
-+
diff --git a/CharLS-add_sharedlib_soname.patch b/CharLS-add_sharedlib_soname.patch
deleted file mode 100644 (file)
index 35dee21..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88f0949..c57ef72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,8 +20,21 @@ SET( charls_HEADERS "colortransform.h"  "context.h" "decoderstrategy.h"  "encode
- OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
- SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
--add_library(CharLS header.cpp  interface.cpp  jpegls.cpp  )
-+# Add soname to generated shared lib
-+SET(CHARLS_LIB_MAJOR_VERSION 1)
-+SET(CHARLS_LIB_MINOR_VERSION 0)
-+
-+IF(BUILD_SHARED_LIBS)
-+       add_library(CharLS SHARED header.cpp  interface.cpp  jpegls.cpp  
-+         stdafx.cpp
-+         )
-+       set_target_properties( CharLS PROPERTIES
-+                              VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION}
-+                              SOVERSION ${CHARLS_LIB_MAJOR_VERSION}
-+                              ) 
-+
-+ENDIF(BUILD_SHARED_LIBS)
- add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)
- target_link_libraries (charlstest CharLS)
-@@ -29,4 +42,8 @@ target_link_libraries (charlstest CharLS)
- # Installs the header files into the {build_dir}/include/libcharls directory
- install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
-+# Installs the target file (libCharLS.so) into the {build_dir}/lib directory
-+install(TARGETS CharLS LIBRARY DESTINATION lib${LIB_SUFFIX})
-+
-+
diff --git a/CharLS-fix_tests.patch b/CharLS-fix_tests.patch
deleted file mode 100644 (file)
index 2ea6291..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/defaulttraits.h b/defaulttraits.h
-index 5032f7d..734bcea 100644
---- a/defaulttraits.h
-+++ b/defaulttraits.h
-@@ -2,7 +2,7 @@
- // (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use. 
- // 
--
-+#include "header.h"
- #ifndef CHARLS_DEFAULTTRAITS
- #define CHARLS_DEFAULTTRAITS
index 986f7ed0654c219c2a1ebeae7f164b8f4026f179..d004ce299f905312f9728b6ba9b8593b4c83091e 100644 (file)
@@ -1,19 +1,14 @@
 Summary:       An optimized implementation of the JPEG-LS standard
 Summary(pl.UTF-8):     Zoptymalizowana implementacja standardu JPEG-LS
 Name:          CharLS
-Version:       1.0
-Release:       2
+Version:       1.1.0
+Release:       1
 License:       BSD
 Group:         Libraries
-# to download, open this URL in fully JS-capable browser (elinks doesn't suffice)
-# and manually accept BSD(!) license
-#Source0Download: http://charls.codeplex.com/releases/view/55406
-Source0:       %{name}-source-%{version}.zip
-# Source0-md5: 4694f02fbe2c4e1897ff2188d6e3cefc
-Patch0:                %{name}-add_cmake_install_target.patch
-Patch1:                %{name}-add_sharedlib_soname.patch
-Patch2:                %{name}-fix_tests.patch
-URL:           http://charls.codeplex.com/
+#Source0Download: https://github.com/team-charls/charls/releases
+Source0:       https://github.com/team-charls/charls/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: ea02f65abd33aa46830dedec8f4c52f5
+URL:           https://github.com/team-charls/charls
 BuildRequires: cmake >= 2.6
 BuildRequires: libstdc++-devel
 BuildRequires: rpmbuild(macros) >= 1.566
@@ -47,18 +42,12 @@ Header files for CharLS library.
 Pliki nagłówkowe biblioteki CharLS.
 
 %prep
-%setup -q -c
-
-%undos CMakeLists.txt defaulttraits.h
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n charls-%{version}
 
 %build
 %cmake . \
-       -Dcharls_BUILD_SHARED_LIBS=ON \
        -DBUILD_TESTING=ON
+
 %{__make}
 
 %install
@@ -75,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc License.txt
+%doc README.md src/License.txt
 %attr(755,root,root) %{_libdir}/libCharLS.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libCharLS.so.1
 
This page took 0.107738 seconds and 4 git commands to generate.