[arch-commits] Commit in jxrlib/repos/community-x86_64 (4 files)
Filipe Laíns
ffy00 at archlinux.org
Mon Aug 20 15:15:40 UTC 2018
Date: Monday, August 20, 2018 @ 15:15:40
Author: ffy00
Revision: 372880
archrelease: copy trunk to community-x86_64
Added:
jxrlib/repos/community-x86_64/CMakeLists.txt
(from rev 372879, jxrlib/trunk/CMakeLists.txt)
jxrlib/repos/community-x86_64/PKGBUILD
(from rev 372879, jxrlib/trunk/PKGBUILD)
Deleted:
jxrlib/repos/community-x86_64/CMakeLists.txt
jxrlib/repos/community-x86_64/PKGBUILD
----------------+
CMakeLists.txt | 188 +++++++++++++++++++++++++++----------------------------
PKGBUILD | 107 +++++++++++++++----------------
2 files changed, 148 insertions(+), 147 deletions(-)
Deleted: CMakeLists.txt
===================================================================
--- CMakeLists.txt 2018-08-20 15:13:43 UTC (rev 372879)
+++ CMakeLists.txt 2018-08-20 15:15:40 UTC (rev 372880)
@@ -1,94 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-project(jxrlib C CXX)
-
-set(JXRLIB_MAJOR 0)
-set(JXRLIB_MINOR 0)
-
-set(JXRLIB_LIB_VERSION ${JXRLIB_MAJOR}.${JXRLIB_MINOR}.0)
-set(JXRLIB_SO_VERSION ${JXRLIB_MAJOR})
-
-#find_package(JNI)
-#if (JNI_FOUND)
-# message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
-# message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
-# message (STATUS "JAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH}")
-# message (STATUS "JAVA_INCLUDE_PATH2=${JAVA_INCLUDE_PATH2}")
-#endif()
-#INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH})
-#INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH2})
-
-include(TestBigEndian)
-test_big_endian(ISBIGENDIAN)
-if(ISBIGENDIAN)
- set(DEF_ENDIAN -D_BIG__ENDIAN_)
-endif()
-
-add_definitions(-D__ANSI__ -DDISABLE_PERF_MEASUREMENT ${DEF_ENDIAN})
-
-include_directories(
- common/include
- image/sys
- jxrgluelib
- jxrtestlib
-)
-
-# JXR Library
-file(GLOB jpegxr_SRC image/sys/*.c image/decode/*.c image/encode/*.c)
-file(GLOB jpegxr_HDR image/sys/*.h image/decode/*.h image/encode/*.h)
-
-add_library(jpegxr SHARED ${jpegxr_SRC} ${jpegxr_HDR})
-set_target_properties(jpegxr PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION})
-
-install(TARGETS jpegxr
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
-)
-
-# JXR-GLUE Library
-file(GLOB jxrglue_SRC jxrgluelib/*.c jxrtestlib/*.c)
-file(GLOB jxrglue_HDR jxrgluelib/*.h jxrtestlib/*.h)
-
-add_library(jxrglue SHARED ${jxrglue_SRC} ${jxrglue_HDR})
-set_target_properties(jxrglue PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION})
-target_link_libraries(jxrglue jpegxr m)
-
-install(TARGETS jxrglue
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
-)
-
-# JXR-JAVA Library
-#file(GLOB jxrjava_SRC java/target/swig/JXR_wrap.cxx cpp/lib/*.cpp)
-#file(GLOB jxrjava_SRC cpp/lib/*.hpp)
-
-#add_library(jxrjava SHARED ${jxrjava_SRC} ${jxrjava_HDR})
-#set_target_properties(jxrjava PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION})
-#target_link_libraries(jxrjava jpegxr m)
-
-#install(TARGETS jxrjava
-# RUNTIME DESTINATION bin
-# LIBRARY DESTINATION lib${LIB_SUFFIX}
-# ARCHIVE DESTINATION lib${LIB_SUFFIX}
-#)
-
-# JxrEncApp Executable
-add_executable(JxrEncApp jxrencoderdecoder/JxrEncApp.c)
-target_link_libraries(JxrEncApp jxrglue)
-install(TARGETS JxrEncApp RUNTIME DESTINATION bin)
-
-# JxrDecApp Executable
-add_executable(JxrDecApp jxrencoderdecoder/JxrDecApp.c)
-target_link_libraries(JxrDecApp jxrglue)
-install(TARGETS JxrDecApp RUNTIME DESTINATION bin)
-
-# Headers
-install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h image/sys/windowsmediaphoto.h
- DESTINATION include/jxrlib
-)
-install(DIRECTORY common/include/ DESTINATION include/jxrlib
- FILES_MATCHING PATTERN "*.h"
-)
-
-
Copied: jxrlib/repos/community-x86_64/CMakeLists.txt (from rev 372879, jxrlib/trunk/CMakeLists.txt)
===================================================================
--- CMakeLists.txt (rev 0)
+++ CMakeLists.txt 2018-08-20 15:15:40 UTC (rev 372880)
@@ -0,0 +1,94 @@
+cmake_minimum_required(VERSION 2.8)
+project(jxrlib C CXX)
+
+set(JXRLIB_MAJOR 0)
+set(JXRLIB_MINOR 0)
+
+set(JXRLIB_LIB_VERSION ${JXRLIB_MAJOR}.${JXRLIB_MINOR}.0)
+set(JXRLIB_SO_VERSION ${JXRLIB_MAJOR})
+
+#find_package(JNI)
+#if (JNI_FOUND)
+# message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
+# message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
+# message (STATUS "JAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH}")
+# message (STATUS "JAVA_INCLUDE_PATH2=${JAVA_INCLUDE_PATH2}")
+#endif()
+#INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH})
+#INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH2})
+
+include(TestBigEndian)
+test_big_endian(ISBIGENDIAN)
+if(ISBIGENDIAN)
+ set(DEF_ENDIAN -D_BIG__ENDIAN_)
+endif()
+
+add_definitions(-D__ANSI__ -DDISABLE_PERF_MEASUREMENT ${DEF_ENDIAN})
+
+include_directories(
+ common/include
+ image/sys
+ jxrgluelib
+ jxrtestlib
+)
+
+# JXR Library
+file(GLOB jpegxr_SRC image/sys/*.c image/decode/*.c image/encode/*.c)
+file(GLOB jpegxr_HDR image/sys/*.h image/decode/*.h image/encode/*.h)
+
+add_library(jpegxr SHARED ${jpegxr_SRC} ${jpegxr_HDR})
+set_target_properties(jpegxr PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION})
+
+install(TARGETS jpegxr
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+)
+
+# JXR-GLUE Library
+file(GLOB jxrglue_SRC jxrgluelib/*.c jxrtestlib/*.c)
+file(GLOB jxrglue_HDR jxrgluelib/*.h jxrtestlib/*.h)
+
+add_library(jxrglue SHARED ${jxrglue_SRC} ${jxrglue_HDR})
+set_target_properties(jxrglue PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION})
+target_link_libraries(jxrglue jpegxr m)
+
+install(TARGETS jxrglue
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+)
+
+# JXR-JAVA Library
+#file(GLOB jxrjava_SRC java/target/swig/JXR_wrap.cxx cpp/lib/*.cpp)
+#file(GLOB jxrjava_SRC cpp/lib/*.hpp)
+
+#add_library(jxrjava SHARED ${jxrjava_SRC} ${jxrjava_HDR})
+#set_target_properties(jxrjava PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION})
+#target_link_libraries(jxrjava jpegxr m)
+
+#install(TARGETS jxrjava
+# RUNTIME DESTINATION bin
+# LIBRARY DESTINATION lib${LIB_SUFFIX}
+# ARCHIVE DESTINATION lib${LIB_SUFFIX}
+#)
+
+# JxrEncApp Executable
+add_executable(JxrEncApp jxrencoderdecoder/JxrEncApp.c)
+target_link_libraries(JxrEncApp jxrglue)
+install(TARGETS JxrEncApp RUNTIME DESTINATION bin)
+
+# JxrDecApp Executable
+add_executable(JxrDecApp jxrencoderdecoder/JxrDecApp.c)
+target_link_libraries(JxrDecApp jxrglue)
+install(TARGETS JxrDecApp RUNTIME DESTINATION bin)
+
+# Headers
+install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h image/sys/windowsmediaphoto.h
+ DESTINATION include/jxrlib
+)
+install(DIRECTORY common/include/ DESTINATION include/jxrlib
+ FILES_MATCHING PATTERN "*.h"
+)
+
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-20 15:13:43 UTC (rev 372879)
+++ PKGBUILD 2018-08-20 15:15:40 UTC (rev 372880)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
-# Contributor: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=jxrlib
-pkgver=0.2.1
-pkgrel=2
-pkgdesc="Open source implementation of jpegxr"
-arch=('x86_64')
-url="https://archive.codeplex.com/?p=jxrlib"
-license=('GPL')
-depends=('glibc' 'java-runtime')
-makedepends=('cmake' 'swig' 'maven' 'java-environment')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/glencoesoftware/jxrlib/archive/v$pkgver.tar.gz"
- 'CMakeLists.txt')
-sha512sums=('bcf69c9bec32829c266e60540fdc2e8d16d9bf7e0d3930327db5bfce6d1fc2c8b67c7a2b236d128ff3ce89b1c2a14b27a69cdf5bda365c4fcaac98d76b8bd406'
- '832557a5aa0825132aefe38f5136159f1d2ac46bf8455745877342e08db5752c73c34f16a7edf3fd5fa8813f1c48a1b5d77d91901301e2322f18b520bbe97ae6')
-
-prepare() {
- cp CMakeLists.txt $pkgname-$pkgver/
-}
-
-build() {
- # Generate jni files
- cd $pkgname-$pkgver/java
-
- mkdir -p target/swig/ome/jxrlib
- swig -java -c++ -package ome.jxrlib -outdir target/swig/ome/jxrlib -o target/swig/JXR_wrap.cxx JXR.i
-
- # Build source
- mkdir -p ../build
- cd ../build
-
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
-
- make
-
- # Compile java library
- cd ../java
- mvn install -DskipTests
-}
-
-package() {
- cd $pkgname-$pkgver/build
-
- make DESTDIR="$pkgdir" install
-
- cd ../java/target
-
- install -Dm 644 $pkgname-$pkgver.jar "$pkgdir"/usr/share/java/$pkgname-$pkgver.jar
-}
Copied: jxrlib/repos/community-x86_64/PKGBUILD (from rev 372879, jxrlib/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-20 15:15:40 UTC (rev 372880)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
+# Contributor: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=jxrlib
+pkgver=0.2.1
+pkgrel=3
+pkgdesc="Open source implementation of jpegxr"
+arch=('x86_64')
+url="https://archive.codeplex.com/?p=jxrlib"
+license=('GPL')
+depends=('glibc')
+optdepends=('java-runtime: Java bindings')
+makedepends=('cmake' 'swig' 'maven' 'java-environment')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/glencoesoftware/jxrlib/archive/v$pkgver.tar.gz"
+ 'CMakeLists.txt')
+sha512sums=('bcf69c9bec32829c266e60540fdc2e8d16d9bf7e0d3930327db5bfce6d1fc2c8b67c7a2b236d128ff3ce89b1c2a14b27a69cdf5bda365c4fcaac98d76b8bd406'
+ '832557a5aa0825132aefe38f5136159f1d2ac46bf8455745877342e08db5752c73c34f16a7edf3fd5fa8813f1c48a1b5d77d91901301e2322f18b520bbe97ae6')
+
+prepare() {
+ cp CMakeLists.txt $pkgname-$pkgver/
+}
+
+build() {
+ # Generate jni files
+ cd $pkgname-$pkgver/java
+
+ mkdir -p target/swig/ome/jxrlib
+ swig -java -c++ -package ome.jxrlib -outdir target/swig/ome/jxrlib -o target/swig/JXR_wrap.cxx JXR.i
+
+ # Build source
+ mkdir -p ../build
+ cd ../build
+
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+
+ make
+
+ # Compile java library
+ cd ../java
+ mvn install -DskipTests
+}
+
+package() {
+ cd $pkgname-$pkgver/build
+
+ make DESTDIR="$pkgdir" install
+
+ cd ../java/target
+
+ install -Dm 644 $pkgname-$pkgver.jar "$pkgdir"/usr/share/java/$pkgname-$pkgver.jar
+}
More information about the arch-commits
mailing list