Index: create-0.28.1-samples-patch/file.list
===================================================================
--- create-0.28.1-samples-patch/file.list (revision 254)
+++ create-0.28.1-samples-patch/file.list (nonexistent)
@@ -1 +0,0 @@
-exiv2-0.28.1/meson.build
Index: create-0.28.1-samples-patch/create.patch.sh
===================================================================
--- create-0.28.1-samples-patch/create.patch.sh (revision 254)
+++ create-0.28.1-samples-patch/create.patch.sh (nonexistent)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-VERSION=0.28.1
-
-tar --files-from=file.list -xJvf ../exiv2-$VERSION.tar.xz
-mv exiv2-$VERSION exiv2-$VERSION-orig
-
-cp -rf ./exiv2-$VERSION-new ./exiv2-$VERSION
-
-diff --unified -Nr exiv2-$VERSION-orig exiv2-$VERSION > exiv2-$VERSION-samples.patch
-
-mv exiv2-$VERSION-samples.patch ../patches
-
-rm -rf ./exiv2-$VERSION
-rm -rf ./exiv2-$VERSION-orig
Property changes on: create-0.28.1-samples-patch/create.patch.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: create-0.28.1-samples-patch/exiv2-0.28.1-new/meson.build
===================================================================
--- create-0.28.1-samples-patch/exiv2-0.28.1-new/meson.build (revision 254)
+++ create-0.28.1-samples-patch/exiv2-0.28.1-new/meson.build (nonexistent)
@@ -1,164 +0,0 @@
-project(
- 'exiv2',
- 'cpp',
- version: '0.28.1',
- meson_version: '>=0.54.1',
- default_options: ['warning_level=0', 'cpp_std=c++17'],
-)
-
-cargs = []
-cpp = meson.get_compiler('cpp')
-if host_machine.system() == 'windows' and get_option('default_library') != 'static'
- cargs += '-DEXIV2API=__declspec(dllexport)'
-elif cpp.has_function_attribute('visibility')
- cargs += '-DEXIV2API=__attribute__((visibility("default")))'
-else
- cargs += '-DEXIV2API='
-endif
-
-if host_machine.system() == 'windows'
- if cpp.get_argument_syntax() == 'msvc'
- add_project_arguments('-DNOMINMAX', language: 'cpp')
- elif cpp.compiles('#include <time.h>\n#ifdef _UCRT\n#error\n#endif')
- error('Non UCRT MinGW is unsupported. Please update toolchain')
- endif
-endif
-
-exiv_api = configuration_data()
-exiv_conf = configure_file(output: 'exiv2lib_export.h', configuration: exiv_api)
-
-cdata = configuration_data()
-cdata.set('EXV_PACKAGE_NAME', meson.project_name())
-ver = meson.project_version().split('.')
-if ver[0] == '0'
- sover = ver[1].to_int()
-else
- sover = 30 + (ver[0].to_int() - 1)
-endif
-cdata.set('PROJECT_VERSION_MAJOR', ver[0])
-cdata.set('PROJECT_VERSION_MINOR', ver[1])
-cdata.set('PROJECT_VERSION_PATCH', ver[2])
-cdata.set('PROJECT_VERSION_TWEAK', 9)
-cdata.set('PROJECT_VERSION', '@0@.@1@'.format(meson.project_version(), cdata.get('PROJECT_VERSION_TWEAK')))
-cdata.set('EXV_PACKAGE_VERSION', '@0@.@1@'.format(meson.project_version(), cdata.get('PROJECT_VERSION_TWEAK')))
-cdata.set('EXV_PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), cdata.get('PROJECT_VERSION')))
-
-cdata.set('EXV_HAVE_STRERROR_R', cpp.has_function('strerror_r'))
-cdata.set('EXV_STRERROR_R_CHAR_P', not cpp.compiles('#include <string.h>\nint strerror_r(int,char*,size_t);int main(){}'))
-
-cdata.set('EXV_ENABLE_BMFF', get_option('bmff'))
-cdata.set('EXV_HAVE_LENSDATA', get_option('lensdata'))
-cdata.set('EXV_ENABLE_VIDEO', get_option('video'))
-
-deps = []
-deps += cpp.find_library('ws2_32', required: host_machine.system() == 'windows')
-deps += cpp.find_library('procstat', required: host_machine.system() == 'freebsd')
-
-if cpp.get_argument_syntax() == 'gcc' and cpp.version().version_compare('<9')
- if host_machine.system() == 'linux' and cpp.get_define('_LIBCPP_VERSION', prefix: '#include <new>') == ''
- deps += cpp.find_library('stdc++fs')
- elif cpp.get_id() == 'clang'
- deps += cpp.find_library('c++fs')
- endif
-endif
-
-brotli_dep = dependency('libbrotlidec', disabler: true, required: false)
-if brotli_dep.found()
- deps += brotli_dep
-endif
-
-curl_dep = dependency('libcurl', disabler: true, required: get_option('curl'))
-if curl_dep.found()
- deps += curl_dep
-endif
-
-expat_dep = dependency('expat', disabler: true, required: get_option('xmp'))
-if expat_dep.found()
- deps += expat_dep
-endif
-
-inih_dep = dependency('INIReader', disabler: true, required: get_option('inih'))
-if inih_dep.found()
- deps += inih_dep
-endif
-
-zlib_dep = dependency('zlib', disabler: true, required: get_option('png'))
-if zlib_dep.found()
- deps += zlib_dep
-endif
-
-if meson.version().version_compare('>= 0.60')
- iconv_dep = dependency('iconv', required: get_option('iconv'))
-elif not get_option('iconv').disabled() and not cpp.links('#include <iconv.h>\nint main(){iconv_open("", "");}')
- iconv_dep = cpp.find_library('iconv', required: get_option('iconv'))
-else
- iconv_dep = get_option('iconv').disabled() ? dependency('', required: false) : declare_dependency()
-endif
-if iconv_dep.found()
- deps += iconv_dep
-endif
-
-if meson.version().version_compare('>= 0.60')
- intl_dep = dependency('intl', required: get_option('nls'))
-else
- intl_dep = dependency('', required: false)
-endif
-if intl_dep.found()
- add_project_arguments('-DEXV_LOCALEDIR="@0@"'.format(get_option('prefix') / get_option('localedir')), language: 'cpp')
- deps += intl_dep
-endif
-
-cdata.set('EXV_ENABLE_INIH', inih_dep.found())
-cdata.set('EXV_HAVE_XMP_TOOLKIT', expat_dep.found())
-cdata.set('EXV_HAVE_BROTLI', brotli_dep.found())
-cdata.set('EXV_HAVE_ICONV', iconv_dep.found())
-cdata.set('EXV_HAVE_LIBZ', zlib_dep.found())
-cdata.set('EXV_USE_CURL', curl_dep.found())
-cdata.set('EXV_ENABLE_NLS', intl_dep.found())
-cdata.set('EXV_ENABLE_WEBREADY', curl_dep.found())
-
-cfile = configure_file(
- input: 'cmake/config.h.cmake',
- output: 'exv_conf.h',
- format: 'cmake@',
- configuration: cdata,
-)
-
-libinc = include_directories('.', 'include/exiv2')
-depinc = include_directories('.', 'include')
-subdir('xmpsdk')
-subdir('src')
-subdir('include')
-
-install_man('man/man1/exiv2.1')
-
-exiv2_sources = files(
- 'app/actions.cpp',
- 'app/app_utils.cpp',
- 'app/exiv2.cpp',
- 'app/getopt.cpp',
- host_machine.system() == 'windows' ? 'app/wmain.cpp' : [],
-)
-
-exiv2inc = include_directories('src', 'include/exiv2')
-executable(
- 'exiv2',
- exiv2_sources,
- include_directories: exiv2inc,
- dependencies: exiv2_dep,
- install: true,
-)
-
-gopt = [
- 'getopt-test',
- 'metacopy',
- 'path-test',
-]
-
-ginc = include_directories('app')
-foreach g : gopt
- executable(g, 'samples/@0@.cpp'.format(g), 'app/getopt.cpp', dependencies: exiv2_dep, include_directories: [exiv2inc, ginc])
-endforeach
-
-subdir('unitTests')
-subdir('po')
Index: patches/README
===================================================================
--- patches/README (revision 254)
+++ patches/README (nonexistent)
@@ -1,6 +0,0 @@
-
-/* begin *
-
- TODO: Leave some comment here.
-
- * end */
Index: patches
===================================================================
--- patches (revision 254)
+++ patches (nonexistent)
Property changes on: patches
___________________________________________________________________
Deleted: svn:ignore
## -1,74 +0,0 ##
-
-# install dir
-dist
-
-# Target build dirs
-.a1x-newlib
-.a2x-newlib
-.at91sam7s-newlib
-
-.build-machine
-
-.a1x-glibc
-.a2x-glibc
-.h3-glibc
-.h5-glibc
-.i586-glibc
-.i686-glibc
-.imx6-glibc
-.jz47xx-glibc
-.makefile
-.am335x-glibc
-.omap543x-glibc
-.p5600-glibc
-.power8-glibc
-.power8le-glibc
-.power9-glibc
-.power9le-glibc
-.m1000-glibc
-.riscv64-glibc
-.rk328x-glibc
-.rk33xx-glibc
-.rk339x-glibc
-.rk358x-glibc
-.s8xx-glibc
-.s9xx-glibc
-.x86_64-glibc
-
-# Hidden files (each file)
-.makefile
-.dist
-.rootfs
-
-# src & hw requires
-.src_requires
-.src_requires_depend
-.requires
-.requires_depend
-
-# Tarballs
-*.gz
-*.bz2
-*.lz
-*.xz
-*.tgz
-*.txz
-
-# Signatures
-*.asc
-*.sig
-*.sign
-*.sha1sum
-
-# Patches
-*.patch
-
-# Descriptions
-*.dsc
-*.txt
-
-# Default linux config files
-*.defconfig
-
-# backup copies
-*~
Index: Makefile
===================================================================
--- Makefile (revision 254)
+++ Makefile (revision 255)
@@ -14,14 +14,10 @@
tarballs = $(addsuffix .$(suffix), $(addprefix $(pkgname)-, $(versions)))
sha1s = $(addsuffix .sha1sum, $(tarballs))
-patches = $(CURDIR)/patches/exiv2-0.28.1-samples.patch
-.NOTPARALLEL: $(patches)
+BUILD_TARGETS = $(tarballs) $(sha1s)
-BUILD_TARGETS = $(tarballs) $(sha1s) $(patches)
-
-
include ../../../../build-system/core.mk
@@ -47,10 +43,5 @@
fi ; \
done
-$(patches): $(sha1s)
- @echo -e "\n======= Create Patches =======\n" ; \
- ( cd create-0.28.1-samples-patch ; ./create.patch.sh ) ; \
- echo -e "\n"
-
download_clean:
- @rm -f $(tarballs) $(sha1s) $(patches)
+ @rm -f $(tarballs) $(sha1s)