FreeBSD Bugzilla – Attachment 164824 Details for
Bug 205485
games/megaglest: Update to 3.12.0, Take MAINTAINER'ship
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
megaglest diff
megaglest-3.11.1.diff (text/plain), 5.13 KB, created by
Thibault Payet
on 2015-12-29 16:34:14 UTC
(
hide
)
Description:
megaglest diff
Filename:
MIME Type:
Creator:
Thibault Payet
Created:
2015-12-29 16:34:14 UTC
Size:
5.13 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (révision 404718) >+++ Makefile (copie de travail) >@@ -2,13 +2,11 @@ > # $FreeBSD$ > > PORTNAME= megaglest >-PORTVERSION= 3.9.0.4 >-PORTREVISION= 8 >+PORTVERSION= 3.11.1 > CATEGORIES= games >-MASTER_SITES= SF/${PORTNAME}/archived/${PORTNAME}_3.9.0/ > DISTNAME= ${PORTNAME}-source-${PORTVERSION} > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= monwarez@mailoo.org > COMMENT= Open source 3D real-time strategy game > > LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ >@@ -20,6 +18,10 @@ > ${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc > RUN_DEPENDS= ${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data > >+USE_GITHUB= yes >+GH_ACCOUNT= MegaGlest >+GH_PROJECT= megaglest-source >+ > SUB_FILES= pkg-message > > USES= cmake compiler:c++11-lib display:build dos2unix jpeg lua \ >@@ -28,11 +30,9 @@ > USE_SDL= yes > USE_WX= 3.0 > USE_CXXSTD= c++11 >-WX_UNICODE= yes > > CFLAGS+= -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib -lssl -lcrypto >-WRKSRC= ${WRKDIR}/${PORTNAME}-3.9.0 > > OPTIONS_DEFINE= EDITOR DOCS > OPTIONS_SUB= yes >@@ -49,13 +49,16 @@ > do-install: > ${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest > @${MKDIR} ${STAGEDIR}${DATADIR} >+ ${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/ >+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons >+ ${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.png ${STAGEDIR}${PREFIX}/share/icons/ > ${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >-.for f in glest.ini glestkeys.ini servers.ini >+.for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini > ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} > .endfor > .if ${PORT_OPTIONS:MDOCS} > @${MKDIR} ${STAGEDIR}${DOCSDIR} >-. for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt >+. for f in docs/AUTHORS.source_code.txt docs/CHANGELOG.txt docs/README.txt docs/COPYRIGHT.source_code.txt > ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} > . endfor > .endif >Index: distinfo >=================================================================== >--- distinfo (révision 404718) >+++ distinfo (copie de travail) >@@ -1,2 +1,2 @@ >-SHA256 (megaglest-source-3.9.0.4.tar.xz) = 3362ade61af3c01c2d8976d2d481769698dc0c800f35251b8c5489f8e41d9bc3 >-SIZE (megaglest-source-3.9.0.4.tar.xz) = 1596692 >+SHA256 (megaglest-source-3.11.1_GH0.tar.xz) = 6bbbbb69d01bc765f439a60c74178b75dc47753cc126e6758e3bc740d8b42a21 >+SIZE (megaglest-source-3.11.1_GH0.tar.xz) = 4807372 >Index: files/patch-source_shared__lib_sources_miniz_miniz.c >=================================================================== >--- files/patch-source_shared__lib_sources_miniz_miniz.c (révision 404718) >+++ files/patch-source_shared__lib_sources_miniz_miniz.c (nonexistent) >@@ -1,19 +0,0 @@ >---- source/shared_lib/sources/miniz/miniz.c.orig 2015-04-13 04:50:02 UTC >-+++ source/shared_lib/sources/miniz/miniz.c >-@@ -2765,6 +2765,7 @@ mz_uint tdefl_create_comp_flags_from_zip >- // http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/. >- void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out) >- { >-+ static const mz_uint8 chans[] = {0x00, 0x00, 0x04, 0x02, 0x06}; >- tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); tdefl_output_buffer out_buf; int i, bpl = w * num_chans, y, z; mz_uint32 c; *pLen_out = 0; >- if (!pComp) return NULL; >- MZ_CLEAR_OBJ(out_buf); out_buf.m_expandable = MZ_TRUE; out_buf.m_capacity = 57+MZ_MAX(64, (1+bpl)*h); if (NULL == (out_buf.m_pBuf = (mz_uint8*)MZ_MALLOC(out_buf.m_capacity))) { MZ_FREE(pComp); return NULL; } >-@@ -2778,7 +2779,7 @@ void *tdefl_write_image_to_png_file_in_m >- *pLen_out = out_buf.m_size-41; >- { >- mz_uint8 pnghdr[41]={0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, >-- 0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,"\0\0\04\02\06"[num_chans],0,0,0,0,0,0,0, >-+ 0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,chans[num_chans],0,0,0,0,0,0,0, >- (mz_uint8)(*pLen_out>>24),(mz_uint8)(*pLen_out>>16),(mz_uint8)(*pLen_out>>8),(mz_uint8)*pLen_out,0x49,0x44,0x41,0x54}; >- c=(mz_uint32)mz_crc32(MZ_CRC32_INIT,pnghdr+12,17); for (i=0; i<4; ++i, c<<=8) ((mz_uint8*)(pnghdr+29))[i]=(mz_uint8)(c>>24); >- memcpy(out_buf.m_pBuf, pnghdr, 41); > >Modification de propriétés sur files/patch-source_shared__lib_sources_miniz_miniz.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: pkg-plist >=================================================================== >--- pkg-plist (révision 404718) >+++ pkg-plist (copie de travail) >@@ -7,3 +7,5 @@ > %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt > %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt > %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt >+share/applications/megaglest.desktop >+share/icons/megaglest.png
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 205485
:
164451
|
164452
|
164453
|
164599
|
164600
|
164601
|
164625
|
164662
|
164669
|
164696
|
164699
|
164759
|
164824
|
168653
|
168665
|
168666
|
168681
|
168704
|
168890
|
168892
|
168893
|
168901
|
168918
|
168919