cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Enlightenment E16 1.0.19

Browse Source 
Based on a diff for an older version by Timo Myyra.
This commit is contained in:
feinerer 2019-02-24 07:42:16 +00:00
parent d094de60fb
commit 91d908d634
7 changed files with 74 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
x11/enlightenment/Makefile
View File

@ -1,24 +1,23 @@
# $OpenBSD: Makefile,v 1.72 2018/06/27 21:04:07 espie Exp $
# $OpenBSD: Makefile,v 1.73 2019/02/24 07:42:16 feinerer Exp $
COMMENT= themed window manager
V= 1.0.9
V= 1.0.19
DISTNAME= e16-$V
PKGNAME= enlightenment-$V
DOCS= e16-docs-0.16.8.0.2
THEMES= e16-themes-1.0.1
REVISION= 10
THEMES= e16-themes-1.0.2
CATEGORIES= x11
HOMEPAGE= http://www.enlightenment.org/
HOMEPAGE= https://www.enlightenment.org/e16
# X11
PERMIT_PACKAGE_CDROM= Yes
WANTLIB = FLAC ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
WANTLIB += freetype glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += freetype fribidi glib-2.0 gobject-2.0 graphite2
WANTLIB += gthread-2.0 harfbuzz iconv intl m ogg pango-1.0 pangoft2-1.0
WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z
@ -28,8 +27,8 @@ DISTFILES= ${DISTNAME}.tar.gz \
${DOCS}.tar.gz \
${THEMES}.tar.gz
AUTOCONF_VERSION= 2.65
AUTOMAKE_VERSION= 1.11
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@ -45,22 +44,19 @@ SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-sound_esound
CONFIGURE_ARGS+= --enable-sound=sndio \
--with-sndldr=audiofile
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
post-extract:
cp -f ${FILESDIR}/sound_sndio.c ${WRKSRC}/src
pre-configure:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoconf
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoheader
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake
do-gen:
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} aclocal -I m4
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoconf
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoheader
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} automake
post-configure:
@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \

8
x11/enlightenment/distinfo
View File

@ -1,6 +1,6 @@
SHA256 (e16-1.0.9.tar.gz) = 1DWECkpCnLIvJB14iegoJwYfbvXM2bvIcgr1He4FPSc=
SHA256 (e16-1.0.19.tar.gz) = +nVGaLhsvmm8EgYfeI9y42aeb8mFeeOAu9BXxSqwvqQ=
SHA256 (e16-docs-0.16.8.0.2.tar.gz) = uNjgyvRZMc5nL6UIipY2hVM6Zamoz+7hUjnZbzuRWT8=
SHA256 (e16-themes-1.0.1.tar.gz) = M85IxdVlGuOl1WdD9od1zLdj661wMG669+FiWHlAyGU=
SIZE (e16-1.0.9.tar.gz) = 2256543
SHA256 (e16-themes-1.0.2.tar.gz) = f/3/XB+koTxwcVNWyVIlZIfQ1k8OpRPnVhHKbmE+coU=
SIZE (e16-1.0.19.tar.gz) = 2459808
SIZE (e16-docs-0.16.8.0.2.tar.gz) = 1655229
SIZE (e16-themes-1.0.1.tar.gz) = 8249438
SIZE (e16-themes-1.0.2.tar.gz) = 8220355

64
x11/enlightenment/patches/patch-configure_ac
View File

@ -1,35 +1,41 @@
$OpenBSD: patch-configure_ac,v 1.1 2014/11/04 08:35:57 armani Exp $
--- configure.ac.orig Sun Jul 31 13:33:50 2011
+++ configure.ac Thu Nov 15 21:38:44 2012
@@ -93,6 +93,10 @@ if test "x$enable_sound" = "xyes"; then
AC_ARG_ENABLE(sound_esound,
[ --enable-sound-esound compile with EsounD sound support @<:@default=yes@:>@],,
enable_sound_esound=yes)
+ AC_ARG_ENABLE(sound_sndio,
+ [ --enable-sound-sndio compile with sndio sound support @<:@default=yes@:>@],,
+ enable_sound_sndio=yes)
+
fi
enable_sound=no
$OpenBSD: patch-configure_ac,v 1.2 2019/02/24 07:42:16 feinerer Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -91,12 +91,12 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnom
@@ -124,6 +128,20 @@ if test "x$enable_sound_esound" = "xyes"; then
enable_sound=esound
AC_ARG_ENABLE(sound,
AC_HELP_STRING([--enable-sound],
- [compile with sound support (pulseaudio/esound/no)@<:@default=pulseaudio@:>@]),,
+ [compile with sound support (pulseaudio/esound/sndio/no)@<:@default=pulseaudio@:>@]),,
enable_sound=pulseaudio)
case x$enable_sound in
xyes)
enable_sound=pulseaudio;;
-xpulseaudio|xesound)
+xpulseaudio|xesound|xsndio)
;;
*)
enable_sound=no;;
@@ -137,6 +137,21 @@ if test "x$enable_sound" = "xesound"; then
fi
fi
AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esound" = "xyes")
AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound" = "xesound")
+
+if test "x$enable_sound_sndio" = "xyes"; then
+ AC_CHECK_HEADERS(sndio.h,, enable_sound_sndio=no)
+ AC_CHECK_LIB(sndio, sio_open, SNDIO_LIBS="-lsndio", enable_sound_sndio=no)
+if test "x$enable_sound" = "xsndio"; then
+ AC_CHECK_HEADERS(sndio.h,, enable_sound=no
+ AC_MSG_WARN([sndio sound support was requested but not found.]))
+ AC_CHECK_LIB(sndio, sio_open, SNDIO_LIBS="-lsndio", enable_sound=no)
+ AC_SUBST(SNDIO_LIBS)
+ if test "x$enable_sound" = "xsndio"; then
+ AC_DEFINE(HAVE_SOUND, 1, [Sound support])
+ AC_DEFINE(HAVE_SOUND_SNDIO, 1, [Sndio sound support])
+ AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
+ PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
+ enable_sound=sndio
+ fi
+fi
+if test "x$enable_sound_sndio" = "xyes"; then
+ AC_DEFINE(HAVE_SOUND, 1, [Sound support])
+ AC_DEFINE(HAVE_SOUND_SNDIO, 1, [Sndio sound support])
+ AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
+ PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
+ enable_sound=sndio
+fi
+AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound_sndio" = "xyes")
+AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound" = "xsndio")
# Save CPPFLAGS/LDFLAGS and add X_... to each
SAVE_CPPFLAGS="$CPPFLAGS"
if test "x$enable_sound" != "xno" -a "x$with_sndldr" = "xnone"; then
AC_MSG_ERROR([Sound support requires a sound loader])

17
x11/enlightenment/patches/patch-m4_ac_attribute_m4
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-m4_ac_attribute_m4,v 1.1 2017/09/28 15:08:54 dcoppa Exp $
Index: m4/ac_attribute.m4
--- m4/ac_attribute.m4.orig
+++ m4/ac_attribute.m4
@@ -16,8 +16,9 @@ AC_DEFUN([AC_C___ATTRIBUTE__],
[
AC_MSG_CHECKING(for __attribute__)
AC_CACHE_VAL(ac_cv___attribute__, [
- AC_TRY_COMPILE([#include <stdlib.h>],
- [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
+ AC_TRY_COMPILE([#include <stdlib.h>
+ int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
+ [],
ac_cv___attribute__=yes, ac_cv___attribute__=no)])
if test "$ac_cv___attribute__" = "yes"; then
AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])

23
x11/enlightenment/patches/patch-src_Makefile_am
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2014/11/04 08:35:57 armani Exp $
--- src/Makefile.am.orig Sun Jul 31 10:02:54 2011
+++ src/Makefile.am Thu Nov 15 21:58:47 2012
@@ -161,7 +161,7 @@ MODULE_LIBS = $(DLOPEN_LIBS)
$OpenBSD: patch-src_Makefile_am,v 1.2 2019/02/24 07:42:16 feinerer Exp $
Index: src/Makefile.am
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -166,7 +166,7 @@ MODULE_LIBS = $(DLOPEN_LIBS)
libe16dir = $(pkglibdir)
@ -10,7 +11,7 @@ $OpenBSD: patch-src_Makefile_am,v 1.1 2014/11/04 08:35:57 armani Exp $
if USE_LIBESD
LIBSND_ESD = libsound_esd.la
@@ -179,6 +179,14 @@ libsound_pa_la_LIBADD = $(PA_LIBS) $(AUDIOFILE_LIBS
@@ -184,6 +184,14 @@ libsound_pa_la_LIBADD = $(PA_LIBS) $(SNDLDR_LIBS)
libsound_pa_la_LDFLAGS = -module -avoid-version
endif
@ -24,17 +25,17 @@ $OpenBSD: patch-src_Makefile_am,v 1.1 2014/11/04 08:35:57 armani Exp $
+
LIBFNT_IFT = libfont_ift.la
libfont_ift_la_SOURCES = ttfont.c
libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS) $(CWARNFLAGS)
@@ -203,9 +211,9 @@ endif
libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS)
@@ -208,9 +216,9 @@ endif
else
-MODULE_SRCS = sound_esd.c sound_pa.c sound_load.c ttfont.c text_xft.c text_pango.c
-MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(AUDIOFILE_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
-MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(AUDIOFILE_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
-MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDLDR_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
-MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDLDR_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
+MODULE_SRCS = sound_esd.c sound_pa.c sound_sndio.c sound_load.c ttfont.c text_xft.c text_pango.c
+MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDIO_LIBS) $(AUDIOFILE_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
+MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDIO_CFLAGS) $(AUDIOFILE_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
+MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDIO_LIBS) $(SNDLDR_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
+MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDIO_CFLAGS) $(SNDLDR_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
endif

9
x11/enlightenment/patches/patch-src_sound_c
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-src_sound_c,v 1.1 2014/11/04 08:35:57 armani Exp $
--- src/sound.c.orig Sun Jul 31 16:02:52 2011
+++ src/sound.c Sun Nov 11 14:48:28 2012
$OpenBSD: patch-src_sound_c,v 1.2 2019/02/24 07:42:16 feinerer Exp $
Index: src/sound.c
--- src/sound.c.orig
+++ src/sound.c
@@ -34,6 +34,8 @@
#define SOUND_SERVER_NAME "esd"
#elif HAVE_SOUND_PA
@ -10,7 +11,7 @@ $OpenBSD: patch-src_sound_c,v 1.1 2014/11/04 08:35:57 armani Exp $
#else
#error Invalid sound configuration
#endif
@@ -72,6 +74,9 @@ static const SoundOps *ops = &SoundOps_esd;
@@ -73,6 +75,9 @@ static const SoundOps *ops = &SoundOps_esd;
#elif HAVE_SOUND_PA
extern const SoundOps SoundOps_pa;
static const SoundOps *ops = &SoundOps_pa;

76
x11/enlightenment/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2018/06/27 21:04:07 espie Exp $
@comment $OpenBSD: PLIST,v 1.17 2019/02/24 07:42:16 feinerer Exp $
@option is-branch
@pkgpath x11/enlightenment
@bin bin/e16
@ -6,7 +6,6 @@
@bin bin/eesh
@bin bin/epp
bin/starte16
lib/e16/
@man man/man1/e16.1
share/applications/e16.desktop
share/doc/e16/
@ -2159,72 +2158,6 @@ share/e16/themes/ShinyMetal/dragbar/images/dragbar_vert_normal.png
share/e16/themes/ShinyMetal/epplets/
share/e16/themes/ShinyMetal/epplets/epplets.cfg
share/e16/themes/ShinyMetal/epplets/images/
share/e16/themes/ShinyMetal/epplets/images/.xvpics/
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_d1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_d2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_d3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_l1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_l2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_l3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_r1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_r2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_r3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_u1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_u2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ar_u3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/b1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/b2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/b3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/bb1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/bb2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/bg_h.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/bg_v.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/close1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/close2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/close3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/config1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/config2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/config3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/da.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/eject1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/eject2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/eject3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ff1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ff2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/ff3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/help1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/help2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/help3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/next1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/next2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/next3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/pause1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/pause2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/pause3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/pb_h.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/pb_v.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/play1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/play2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/play3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/prev1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/prev2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/prev3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/repeat1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/repeat2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/repeat3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/rw1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/rw2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/rw3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/s_h.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/s_k1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/s_k2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/s_v.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/skip1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/skip2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/skip3.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/stop1.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/stop2.png
share/e16/themes/ShinyMetal/epplets/images/.xvpics/stop3.png
share/e16/themes/ShinyMetal/epplets/images/ar_d1.png
share/e16/themes/ShinyMetal/epplets/images/ar_d2.png
share/e16/themes/ShinyMetal/epplets/images/ar_d3.png
@ -2769,13 +2702,10 @@ share/e16/themes/winter/tooltips/tooltips.cfg
share/gnome-session/
share/gnome-session/sessions/
share/gnome-session/sessions/e16-gnome.session
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/e16.mo
share/locale/bg/LC_MESSAGES/e16.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/e16.mo
share/locale/ca/LC_MESSAGES/e16.mo
share/locale/cs/LC_MESSAGES/e16.mo
share/locale/csb/
share/locale/csb/LC_MESSAGES/
@ -2791,6 +2721,7 @@ share/locale/fo/
share/locale/fo/LC_MESSAGES/
share/locale/fo/LC_MESSAGES/e16.mo
share/locale/fr/LC_MESSAGES/e16.mo
share/locale/gl/LC_MESSAGES/e16.mo
share/locale/hr/LC_MESSAGES/e16.mo
share/locale/hu/LC_MESSAGES/e16.mo
share/locale/it/LC_MESSAGES/e16.mo
@ -2803,6 +2734,7 @@ share/locale/pt/LC_MESSAGES/e16.mo
share/locale/pt_BR/LC_MESSAGES/e16.mo
share/locale/ru/LC_MESSAGES/e16.mo
share/locale/sk/LC_MESSAGES/e16.mo
share/locale/sr/LC_MESSAGES/e16.mo
share/locale/sv/LC_MESSAGES/e16.mo
share/locale/tr/LC_MESSAGES/e16.mo
share/locale/uk/LC_MESSAGES/e16.mo