mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

devel/etc, devel/synfig, graphics/synfigstudio: Update to 1.2.2

Browse Source 
- Changed port to use GitHub as MASTER_SITES (follow upstream)
- Use autoreconf to build configure script (not included in GH repo)
- Introduce patches to fix build with autoreconf

Changes this release:
  https://www.synfig.org/2018/09/15/synfig-studio-1-2-2-released/

PR:		237707
Reported by:	kunda <chitty_cloud@me.com>
This commit is contained in:
Ben Woods 2019-12-11 11:23:22 +00:00
parent 74ee1dac4d
commit 721acd7c37
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=519795
15 changed files with 158 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devel/etl/Makefile
View File

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= etl
PORTVERSION= 1.2.1
PORTVERSION= 1.2.2
DISTVERSIONPREFIX=v
CATEGORIES= devel lang
MASTER_SITES= SF/synfig/releases/${SYNFIG_VERSION}/source/
DISTNAME= ETL-${PORTVERSION}
MAINTAINER= woodsb02@FreeBSD.org
COMMENT= Voria Extended Class and Template Library
@ -13,17 +12,20 @@ COMMENT= Voria Extended Class and Template Library
LICENSE= GPLv2+
NO_ARCH= yes
PORTSCOUT= limitw:1,even
USES= autoreconf pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= synfig
GH_PROJECT= synfig
WRKSRC_SUBDIR= ETL
OPTIONS_DEFINE= DOCS
SYNFIG_VERSION= 1.2.1
USES= pathfix pkgconfig
GNU_CONFIGURE= yes
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in AUTHORS ChangeLog INSTALL NEWS README
.for doc in AUTHORS NEWS README
${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor

6
devel/etl/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1515222748
SHA256 (ETL-1.2.1.tar.gz) = 754d88c5ddfdef54f27d1e17f62a902eb9f09fbe7ef9aebded34541b4c1700e6
SIZE (ETL-1.2.1.tar.gz) = 373906
TIMESTAMP = 1576020589
SHA256 (synfig-synfig-v1.2.2_GH0.tar.gz) = 7319e9ad62f3ae3e4c25875ac4965f3ecf72b96d8d435b42c91dcd6dd9b0e82d
SIZE (synfig-synfig-v1.2.2_GH0.tar.gz) = 11107386

2
devel/etl/pkg-descr
View File

@ -2,4 +2,4 @@ ETL is a multi-platform class and template library designed to add
new datatypes and functions which combine well with the existing
types and functions from the C++ Standard Template Library (STL).
WWW: http://www.synfig.org/
WWW: https://www.synfig.org/

2
devel/etl/pkg-plist
View File

@ -66,7 +66,5 @@ include/ETL/trivial
include/ETL/value
libdata/pkgconfig/ETL.pc
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README

23
devel/synfig/Makefile
View File

@ -2,17 +2,16 @@
# $FreeBSD$
PORTNAME= synfig
PORTVERSION= 1.2.1
PORTREVISION= 21
PORTVERSION= 1.2.2
DISTVERSIONPREFIX=v
CATEGORIES= devel graphics multimedia
MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/source
MAINTAINER= woodsb02@FreeBSD.org
COMMENT= Vector based 2D animation package
LICENSE= GPLv2+
BUILD_DEPENDS= etl>=1.2.1:devel/etl \
BUILD_DEPENDS= etl>=1.2.2:devel/etl \
gsed:textproc/gsed
LIB_DEPENDS= libHalf.so:graphics/ilmbase \
libIlmImf.so:graphics/openexr \
@ -29,15 +28,19 @@ LIB_DEPENDS= libHalf.so:graphics/ilmbase \
libpng.so:graphics/png \
libtiff.so:graphics/tiff
USES= compiler:c++11-lang gmake gnome iconv jpeg libtool localbase \
pathfix pkgconfig
PORTSCOUT= limitw:1,even
USES= autoreconf compiler:c++11-lang gmake gnome iconv jpeg \
libtool localbase pathfix pkgconfig
USE_CXXSTD= c++11
USE_GITHUB= yes
USE_GNOME= cairo glibmm intltool libxml++26 pango
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG}
CONFIGURE_ENV+= ac_cv_path_SED=${LOCALBASE}/bin/gsed
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
WRKSRC_SUBDIR= synfig-core
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
@ -45,15 +48,9 @@ OPTIONS_SUB= yes
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
post-patch:
@${REINPLACE_CMD} -e \
'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
/optimization_flags/s|CFLAGS=|#CFLAGS=|' \
${WRKSRC}/configure
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
.for doc in AUTHORS NEWS README TODO
(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
.endfor

6
devel/synfig/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1515222796
SHA256 (synfig-1.2.1.tar.gz) = 4d8bada4e99f05ee16b4256fc3f5a551d00a745347944837bbd6fa158b57e457
SIZE (synfig-1.2.1.tar.gz) = 4913740
TIMESTAMP = 1576020568
SHA256 (synfig-synfig-v1.2.2_GH0.tar.gz) = 7319e9ad62f3ae3e4c25875ac4965f3ecf72b96d8d435b42c91dcd6dd9b0e82d
SIZE (synfig-synfig-v1.2.2_GH0.tar.gz) = 11107386

21
devel/synfig/files/patch-configure.ac Normal file
View File

@ -0,0 +1,21 @@
--- configure.ac.orig 2018-09-14 06:35:52 UTC
+++ configure.ac
@@ -47,7 +47,6 @@ AC_C_BIGENDIAN
# -- A R G U M E N T S ----------------------------------------
-AC_ARG_OPTIMIZATION
AC_ARG_DEBUG
AC_ARG_WARNINGS
AC_ARG_PROFILING
@@ -346,10 +345,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKA
localedir="$datadir/locale"
AC_SUBST(localedir)
-
-AM_GNU_GETTEXT([external])
-# This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION([0.15])
PKG_CHECK_MODULES(ETL, [ETL >= 1.2.2],,[
AC_MSG_ERROR([ ** You need to install the ETL (version 1.2.2 or greater).])

2
devel/synfig/pkg-descr
View File

@ -11,4 +11,4 @@ gradient, filter, distortion, transformation, fractal and others. Output
targets include JPEG, PNG, GIF, BMP, PPM, DV, OpenEXR, ffmpeg (MPEG1),
libavcodec (AVI), imagemagick (MIFF), yuv420p and others.
WWW: http://www.synfig.org/
WWW: https://www.synfig.org/

9
devel/synfig/pkg-plist
View File

@ -53,6 +53,7 @@ include/synfig-1.0/synfig/layers/layer_bitmap.h
include/synfig-1.0/synfig/layers/layer_composite.h
include/synfig-1.0/synfig/layers/layer_composite_fork.h
include/synfig-1.0/synfig/layers/layer_duplicate.h
include/synfig-1.0/synfig/layers/layer_filtergroup.h
include/synfig-1.0/synfig/layers/layer_group.h
include/synfig-1.0/synfig/layers/layer_invisible.h
include/synfig-1.0/synfig/layers/layer_meshtransform.h
@ -96,6 +97,7 @@ include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendseparate.h
include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendsplit.h
include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendzero.h
include/synfig-1.0/synfig/rendering/common/optimizer/optimizercalcbounds.h
include/synfig-1.0/synfig/rendering/common/optimizer/optimizerdraft.h
include/synfig-1.0/synfig/rendering/common/optimizer/optimizerlinear.h
include/synfig-1.0/synfig/rendering/common/optimizer/optimizerlist.h
include/synfig-1.0/synfig/rendering/common/optimizer/optimizerpixelprocessorsplit.h
@ -154,6 +156,8 @@ include/synfig-1.0/synfig/rendering/software/optimizer/optimizermeshsw.h
include/synfig-1.0/synfig/rendering/software/optimizer/optimizerpixelcolormatrixsw.h
include/synfig-1.0/synfig/rendering/software/optimizer/optimizerpixelgammasw.h
include/synfig-1.0/synfig/rendering/software/optimizer/optimizersurfaceresamplesw.h
include/synfig-1.0/synfig/rendering/software/rendererdraftsw.h
include/synfig-1.0/synfig/rendering/software/rendererlowressw.h
include/synfig-1.0/synfig/rendering/software/renderersafe.h
include/synfig-1.0/synfig/rendering/software/renderersw.h
include/synfig-1.0/synfig/rendering/software/surfacesw.h
@ -297,11 +301,10 @@ lib/synfig/modules/libmod_svg.so
lib/synfig/modules/libmod_yuv420p.so
libdata/pkgconfig/synfig.pc
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%NLS%%share/locale/aa_DJ/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/ar/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/bs/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/ca/LC_MESSAGES/synfig.mo
@ -326,8 +329,10 @@ libdata/pkgconfig/synfig.pc
%%NLS%%share/locale/it/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/ja/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/ja_JP/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/kab/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/lt/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/lv/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/ne/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/nl/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/no_NO/LC_MESSAGES/synfig.mo
%%NLS%%share/locale/pl_PL/LC_MESSAGES/synfig.mo

26
graphics/synfigstudio/Makefile
View File

@ -2,17 +2,16 @@
# $FreeBSD$
PORTNAME= synfigstudio
PORTVERSION= 1.2.1
PORTREVISION= 12
PORTVERSION= 1.2.2
DISTVERSIONPREFIX=v
CATEGORIES= graphics multimedia
MASTER_SITES= SF/synfig/releases/${PORTVERSION}/source
MAINTAINER= woodsb02@FreeBSD.org
COMMENT= Vector-based 2D animation software package
LICENSE= GPLv2+
BUILD_DEPENDS= etl>=0.04.19_1:devel/etl
BUILD_DEPENDS= etl>=1.2.2:devel/etl
LIB_DEPENDS= libHalf.so:graphics/ilmbase \
libIlmImf.so:graphics/openexr \
libMagick++-6.so:graphics/ImageMagick6 \
@ -23,8 +22,15 @@ LIB_DEPENDS= libHalf.so:graphics/ilmbase \
libsynfig.so:devel/synfig
RUN_DEPENDS= xdg-open:devel/xdg-utils
USES= compiler:c++11-lang desktop-file-utils gmake gnome libtool \
localbase pathfix pkgconfig shared-mime-info
PORTSCOUT= limitw:1,even
USES= autoreconf compiler:c++11-lang desktop-file-utils \
gmake gnome libtool localbase pathfix pkgconfig \
shared-mime-info
USE_GITHUB= yes
GH_ACCOUNT= synfig
GH_PROJECT= synfig
WRKSRC_SUBDIR= synfig-studio
USE_CXXSTD= c++11
USE_GNOME= gtkmm30 intltool
GNU_CONFIGURE= yes
@ -42,15 +48,9 @@ JACK_CONFIGURE_ENABLE= jack
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
post-patch:
@${REINPLACE_CMD} -e \
'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
/optimization_flags/s|CFLAGS=|#CFLAGS=|' \
${WRKSRC}/configure
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
.for doc in AUTHORS NEWS README TODO
(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
.endfor

6
graphics/synfigstudio/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1515222401
SHA256 (synfigstudio-1.2.1.tar.gz) = 1a97875e0039895604085649bcd30cf0d6165f4c865299ca13d45d2dfbfab05d
SIZE (synfigstudio-1.2.1.tar.gz) = 5687045
TIMESTAMP = 1576022739
SHA256 (synfig-synfig-v1.2.2_GH0.tar.gz) = 7319e9ad62f3ae3e4c25875ac4965f3ecf72b96d8d435b42c91dcd6dd9b0e82d
SIZE (synfig-synfig-v1.2.2_GH0.tar.gz) = 11107386

59
graphics/synfigstudio/files/patch-73046ac Normal file
View File

@ -0,0 +1,59 @@
--- src/gui/docks/dock_layers.cpp.orig 2018-09-14 06:35:52 UTC
+++ src/gui/docks/dock_layers.cpp
@@ -118,7 +118,12 @@ Dock_Layers::Dock_Layers():
for(iter=category_map.begin();iter!=category_map.end();++iter)
{
layer_ui_info+=strprintf("<menu action='%s'>%s</menu>",iter->first.c_str(),iter->second.c_str());
- action_group_categories->add(Gtk::Action::create(iter->first.c_str(),dgettext("synfig", iter->first.c_str())));
+ //action_group_categories->add(Gtk::Action::create(iter->first.c_str(),dgettext("synfig", iter->first.c_str())));
+ #ifdef ENABLE_NLS
+ action_group_categories->add(Gtk::Action::create(iter->first.c_str(), dgettext("synfig", iter->first.c_str())));
+ #else
+ action_group_categories->add(Gtk::Action::create(iter->first.c_str(), iter->first.c_str()));
+ #endif
}
App::ui_manager()->insert_action_group(action_group_categories);
--- src/synfigapp/action.cpp.orig 2018-09-14 06:35:52 UTC
+++ src/synfigapp/action.cpp
@@ -170,9 +170,10 @@ synfigapp::Action::Book *book_;
/* === M E T H O D S ======================================================= */
+//be.local_name=dgettext("synfigstudio",x::local_name__);
#define ADD_ACTION(x) { BookEntry &be(book()[x::name__]); \
be.name=x::name__; \
- be.local_name=dgettext("synfigstudio",x::local_name__); \
+ be.local_name=_(x::local_name__); \
be.version=x::version__; \
be.task=x::task__; \
be.priority=x::priority__; \
--- src/synfigapp/action.h.orig 2018-09-14 06:35:52 UTC
+++ src/synfigapp/action.h
@@ -60,9 +60,13 @@
Action::Base* class::create() { return new class(); } \
synfig::String class::get_name()const { return name__; }
+//#define ACTION_INIT(class) \
+// ACTION_INIT_NO_GET_LOCAL_NAME(class) \
+// synfig::String class::get_local_name()const { return dgettext("synfigstudio",local_name__); }
+
#define ACTION_INIT(class) \
ACTION_INIT_NO_GET_LOCAL_NAME(class) \
- synfig::String class::get_local_name()const { return dgettext("synfigstudio",local_name__); }
+ synfig::String class::get_local_name()const { return synfiggui_localize(local_name__); }
/* === T Y P E D E F S ===================================================== */
--- src/synfigapp/localization.h.orig 2018-09-14 06:35:52 UTC
+++ src/synfigapp/localization.h
@@ -48,6 +48,9 @@
/* === C L A S S E S & S T R U C T S ======================================= */
+inline const char* synfiggui_localize(const char *x)
+ { return _(x); }
+
/* === E N D =============================================================== */
#endif

21
graphics/synfigstudio/files/patch-configure.ac Normal file
View File

@ -0,0 +1,21 @@
--- configure.ac.orig 2018-09-14 06:35:52 UTC
+++ configure.ac
@@ -33,7 +33,6 @@ AX_CXX_COMPILE_STDCXX_11([noext], [optional])
AC_LANG([C++])
-AC_ARG_OPTIMIZATION
AC_ARG_DEBUG
case "$debug" in
@@ -75,10 +74,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKA
LOCALEDIR=[${prefix}/${DATADIRNAME}/locale]
AC_SUBST(LOCALEDIR)
-
-AM_GNU_GETTEXT([external])
-# This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION([0.15])
case "$host" in
*mingw* | *cygwin*)

2
graphics/synfigstudio/pkg-descr
View File

@ -2,4 +2,4 @@ synfigstudio is the animation studio for synfig and provides the GUI
interface to create synfig animations which are saved in synfig .sif
format.
WWW: http://www.synfig.org/
WWW: https://www.synfig.org/

6
graphics/synfigstudio/pkg-plist
View File

@ -46,6 +46,7 @@ include/synfigapp-0.0/synfigapp/layercopy.h
include/synfigapp-0.0/synfigapp/layerduplicate.h
include/synfigapp-0.0/synfigapp/layerembed.h
include/synfigapp-0.0/synfigapp/layerencapsulate.h
include/synfigapp-0.0/synfigapp/layerencapsulatefilter.h
include/synfigapp-0.0/synfigapp/layerencapsulateswitch.h
include/synfigapp-0.0/synfigapp/layerextract.h
include/synfigapp-0.0/synfigapp/layerfit.h
@ -125,8 +126,6 @@ lib/libsynfigapp.so.0.0.0
share/appdata/synfigstudio.appdata.xml
share/applications/synfigstudio.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
@ -138,6 +137,7 @@ share/icons/hicolor/32x32/apps/synfig_icon.png
share/icons/hicolor/48x48/apps/synfig_icon.png
share/icons/hicolor/64x64/apps/synfig_icon.png
share/icons/hicolor/scalable/apps/synfig_icon.svg
%%NLS%%share/locale/aa_DJ/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/ar/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/bs/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/ca/LC_MESSAGES/synfigstudio.mo
@ -162,8 +162,10 @@ share/icons/hicolor/scalable/apps/synfig_icon.svg
%%NLS%%share/locale/it/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/ja/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/ja_JP/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/kab/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/lt/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/lv/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/ne/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/nl/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/no_NO/LC_MESSAGES/synfigstudio.mo
%%NLS%%share/locale/pl_PL/LC_MESSAGES/synfigstudio.mo