From cc827979e78448de0907c0b4cc64a082af426100 Mon Sep 17 00:00:00 2001 From: ice0 Date: Sep 19 2018 08:04:29 +0000 Subject: Removed boost_program_options build dependecies --- diff --git a/README.md b/README.md index f14ebb4..f0c71a7 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ you are recommended to uninstall that. You need development & library packages of the following libs: -- boost (system, program_options) +- boost (system) - zlib - libsigc++-2.0 - glibmm-2.4 diff --git a/autobuild/install-requirements-linux.sh b/autobuild/install-requirements-linux.sh index e6820de..dedf1f0 100755 --- a/autobuild/install-requirements-linux.sh +++ b/autobuild/install-requirements-linux.sh @@ -56,7 +56,6 @@ if which dnf >/dev/null; then libtool \ libtool-ltdl-devel \ boost-devel \ - boost-program-options \ shared-mime-info \ OpenEXR-devel \ libmng-devel \ @@ -102,7 +101,6 @@ elif which yum >/dev/null; then libtool \ libtool-ltdl-devel \ boost-devel \ - boost-program-options \ shared-mime-info \ OpenEXR-devel \ libmng-devel \ @@ -128,7 +126,7 @@ elif which zypper >/dev/null; then debootstrap \ rsync" else - PKG_LIST="${PKG_LIST} libpng-devel libjpeg-devel freetype-devel fontconfig-devel atk-devel pango-devel cairo-devel gtk3-devel gettext-devel libxml2-devel libxml++-devel gcc-c++ autoconf automake libtool libtool-ltdl-devel boost-devel boost-program-options shared-mime-info" + PKG_LIST="${PKG_LIST} libpng-devel libjpeg-devel freetype-devel fontconfig-devel atk-devel pango-devel cairo-devel gtk3-devel gettext-devel libxml2-devel libxml++-devel gcc-c++ autoconf automake libtool libtool-ltdl-devel boost-devel shared-mime-info" PKG_LIST="${PKG_LIST} OpenEXR-devel libmng-devel ImageMagick-c++-devel gtkmm3-devel glibmm2-devel" fi if ! ( rpm -qv $PKG_LIST ); then @@ -151,7 +149,6 @@ elif which apt-get >/dev/null; then # PKG_LIST=" \ rpm-build \ - boost-program_options-devel \ git-core \ shared-mime-info \ libltdl3-devel \ @@ -200,7 +197,6 @@ elif which apt-get >/dev/null; then libglibmm-2.4-dev \ libsigc++-2.0-dev \ libxml++2.6-dev \ - libboost-program-options-dev \ libboost-system-dev \ libmagick++-dev \ " diff --git a/synfig-core/configure.ac b/synfig-core/configure.ac index ebb6510..4ba6e7a 100644 --- a/synfig-core/configure.ac +++ b/synfig-core/configure.ac @@ -408,10 +408,6 @@ PKG_CHECK_MODULES(MLTPP, mlt++,,[ CONFIG_DEPS="$CONFIG_DEPS mlt++" AX_BOOST_BASE([1.53.0],,AC_MSG_ERROR([ ** You need to install Boost >= 1.53.0])) -AX_BOOST_PROGRAM_OPTIONS -if test "x$ax_cv_boost_program_options" != "xyes" ; then - AC_MSG_ERROR([ ** You need to install Boost program-options library]) -fi AX_BOOST_SYSTEM if test "x$ax_cv_boost_system" != "xyes" ; then AC_MSG_ERROR([ ** You need to install Boost system library]) @@ -661,7 +657,6 @@ OpenEXR --------------------------> $with_openexr "'$'"SYNFIG_CFLAGS -------------------> '$SYNFIG_CFLAGS' "'$'"BOOST_CPPFLAGS ------------------> '$BOOST_CPPFLAGS' "'$'"BOOST_LDFLAGS -------------------> '$BOOST_LDFLAGS' -"'$'"BOOST_PROGRAM_OPTIONS_LIB -------> '$BOOST_PROGRAM_OPTIONS_LIB' "'$'"BOOST_SYSTEM_LIB ----------------> '$BOOST_SYSTEM_LIB' "'$'"LIBADD_DL -----------------------> '$LIBADD_DL' " diff --git a/synfig-core/src/CMakeLists.txt b/synfig-core/src/CMakeLists.txt index ed264f9..cd9c756 100644 --- a/synfig-core/src/CMakeLists.txt +++ b/synfig-core/src/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.1) ## # TODO: check if we really need all of them -find_package(Boost REQUIRED system program_options) +find_package(Boost REQUIRED system) find_package(ZLIB REQUIRED) find_package(ETL REQUIRED) diff --git a/synfig-core/src/tool/CMakeLists.txt b/synfig-core/src/tool/CMakeLists.txt index a0db116..955b3a3 100644 --- a/synfig-core/src/tool/CMakeLists.txt +++ b/synfig-core/src/tool/CMakeLists.txt @@ -22,7 +22,6 @@ target_link_libraries(synfig_bin synfig) target_link_libraries(synfig_bin ${Boost_SYSTEM_LIBRARIES} ${GIOMM_LIBRARIES} - ${Boost_PROGRAM_OPTIONS_LIBRARIES} ) install ( diff --git a/synfig-core/src/tool/Makefile.am b/synfig-core/src/tool/Makefile.am index 88aac85..5be4d56 100644 --- a/synfig-core/src/tool/Makefile.am +++ b/synfig-core/src/tool/Makefile.am @@ -16,7 +16,6 @@ bin_PROGRAMS = \ synfig synfig_SOURCES = \ - named_type.h \ definitions.h \ progress.h \ renderprogress.h \ @@ -36,7 +35,6 @@ synfig_LDADD = \ ../synfig/libsynfig.la \ @SYNFIG_LIBS@ \ @BOOST_LDFLAGS@ \ - @BOOST_PROGRAM_OPTIONS_LIB@ \ @BOOST_SYSTEM_LIB@ synfig_CXXFLAGS = \ diff --git a/synfig-core/src/tool/joblistprocessor.cpp b/synfig-core/src/tool/joblistprocessor.cpp index 9e1f5c7..4523c6c 100644 --- a/synfig-core/src/tool/joblistprocessor.cpp +++ b/synfig-core/src/tool/joblistprocessor.cpp @@ -35,8 +35,8 @@ #include #include -#include -#include +//#include +//#include //#include #include diff --git a/synfig-core/src/tool/main.cpp b/synfig-core/src/tool/main.cpp index d83d159..ecf33df 100644 --- a/synfig-core/src/tool/main.cpp +++ b/synfig-core/src/tool/main.cpp @@ -35,9 +35,9 @@ #include #include -#include -#include -#include +//#include +//#include +//#include #include #include //#include @@ -66,10 +66,10 @@ #include "joblistprocessor.h" #include "printing_functions.h" -#include "named_type.h" +//#include "named_type.h" #endif -namespace po=boost::program_options; +//namespace po=boost::program_options; std::string _appendAlphaToFilename(std::string input_filename) { diff --git a/synfig-core/src/tool/named_type.h b/synfig-core/src/tool/named_type.h deleted file mode 100644 index 01182e4..0000000 --- a/synfig-core/src/tool/named_type.h +++ /dev/null @@ -1,50 +0,0 @@ -/* === S Y N F I G ========================================================= */ -/*! \file tool/named_type.h -** \brief Named type class -** -** Parameter value type with name -** -** $Id$ -** -** \legal -** Copyright (c) 2012 Diego Barrios Romero -** -** This package is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public License as -** published by the Free Software Foundation; either version 2 of -** the License, or (at your option) any later version. -** -** This package is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** \endlegal -*/ -/* ========================================================================= */ - -#ifndef __SYNFIG_NAMED_TYPE_H -#define __SYNFIG_NAMED_TYPE_H - -/** - * Class for the arguments with name since the Boost library doesn't - * support named arguments, just hardcoded "arg". - * The arguments with a description of the expected argument are clearer - * and hence this class. - * \sa https://svn.boost.org/trac/boost/ticket/4781 - */ -template -struct named_type - : public boost::program_options::typed_value -{ - named_type(std::string const& name) : - boost::program_options::typed_value(&value), - _name(name), - value() - { - } - std::string name() const { return _name; } - std::string _name; - T value; -}; - -#endif diff --git a/synfig-core/src/tool/optionsprocessor.cpp b/synfig-core/src/tool/optionsprocessor.cpp index b43a2d6..92ccc6d 100644 --- a/synfig-core/src/tool/optionsprocessor.cpp +++ b/synfig-core/src/tool/optionsprocessor.cpp @@ -270,8 +270,6 @@ bool SynfigCommandLineParser::parse(int argc, char* argv[]) return true; } -void OptionsProcessor::extract_canvas_info(Job&) {} - void SynfigCommandLineParser::extract_canvas_info(Job& job) { job.canvas_info = true; @@ -338,7 +336,6 @@ void SynfigCommandLineParser::extract_canvas_info(Job& job) }; } -void OptionsProcessor::process_settings_options() {}; void SynfigCommandLineParser::process_settings_options() { if (sw_verbosity > 0) diff --git a/synfig-core/src/tool/optionsprocessor.h b/synfig-core/src/tool/optionsprocessor.h index 8fbb01a..a40cdd7 100644 --- a/synfig-core/src/tool/optionsprocessor.h +++ b/synfig-core/src/tool/optionsprocessor.h @@ -28,11 +28,11 @@ #include #include #include -#include +//#include // TODO rename to CommandLineHandler and move the options creation inside. /// Class to process all the command line options -class OptionsProcessor +/*class OptionsProcessor { public: OptionsProcessor(boost::program_options::variables_map& vm, @@ -82,9 +82,9 @@ private: }; /*! \warning These codecs are linked to the filename extensions for * mod_ffmpeg. If you change this you must change the others accordingly. - */ + *//* std::vector _allowed_video_codecs; -}; +};*/ class SynfigCommandLineParser {