Attachment 161937 Details for Bug 203676 – Patch that updates Jitsi to 2.8 and uses distfile that includes both amd64 and i386 libraries

[patch] Patch that updates Jitsi to 2.8 and uses distfile that includes both amd64 and i386 libraries

patch3.diff (text/plain), 8.94 KB, created by Tzanetos Balitsaris on 2015-10-12 10:50:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tzanetos Balitsaris

Created: 2015-10-12 10:50:42 UTC

Size: 8.94 KB

patch

obsolete

>diff -r -u -N jitsi.bak/Makefile jitsi/Makefile
>--- jitsi.bak/Makefile	2014-05-27 14:51:10.000000000 +0300
>+++ jitsi/Makefile	2015-10-12 02:41:07.645553000 +0300
>@@ -2,11 +2,10 @@
> # $FreeBSD: head/net-im/jitsi/Makefile 355489 2014-05-27 11:51:10Z marino $
> 
> PORTNAME=	jitsi
>-PORTVERSION=	2.3
>+PORTVERSION=	2.8.5426
>+PORTREVISION=	0
> CATEGORIES=	net-im java
>-MASTER_SITES=	http://aetos.it.teithe.gr/~tzabal/ports/jitsi/ \
>-		http://www.c-s.li/ports/
>-DISTNAME=	jitsi-master-084e2b42b5
>+MASTER_SITES=	http://aetos.it.teithe.gr/~tzabal/ports/jitsi/
> 
> MAINTAINER=	tzabal@it.teithe.gr
> COMMENT=	Open source IM and VoIP application
>@@ -19,6 +18,7 @@
> MAKE_ARGS=	rebuild
> USE_LDCONFIG=	${PREFIX}/lib/jitsi/lib/native
> 
>+WRKSRC=		${WRKDIR}/${PORTNAME}
> ONLY_FOR_ARCHS=	i386 amd64
> 
> DESKTOP_ENTRIES="Jitsi" \
>@@ -29,35 +29,29 @@
> 		true
> 
> do-install:
>-	@${ECHO_CMD} ">> Creating Jitsi directories..."
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
>+# Installation directory structure
>+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
>+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle
>+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
> # Bundles (Jitsi modules)
>-	@${ECHO_CMD} ">> Installing bundles (Jitsi modules)..."
>-	@cd ${WRKSRC}/sc-bundles && ${COPYTREE_SHARE} . \
>+	cd ${WRKSRC}/sc-bundles && ${COPYTREE_SHARE} . \
> 		${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
>-	@${RM} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/*slick*.jar
>-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/os-specific
>+	${RM} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/*slick*.jar
>+	${RM} -r ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/os-specific
> # Library JARs
>-	@${ECHO_CMD} ">> Installing library jars..."
>-	@cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} . \
>+	cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} . \
> 		${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle "! -name junit.jar"
>-	@cd ${WRKSRC}/lib && ${COPYTREE_SHARE} "felix.jar jdic-all.jar \
>-		felix.client.run.properties logging.properties" \
>-			${STAGEDIR}${PREFIX}/lib/jitsi/lib
>+	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} "felix.jar logging.properties \
>+		felix.client.run.properties" ${STAGEDIR}${PREFIX}/lib/jitsi/lib
> # Native libraries
>-	@${ECHO_CMD} ">> Installing native (${ARCH}) libraries..."
>-	@cd ${WRKSRC}/lib/native/freebsd${ARCH:S/i386//:S/amd/-/:S/x86_/-/} && \
>+	cd ${WRKSRC}/lib/native/freebsd${ARCH:S/i386//:S/amd/-/:S/x86_/-/} && \
> 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native/*.so
> # Wrapper script to run Jitsi
>-	@${ECHO_CMD} ">> Installing wrapper script..."
> 	${INSTALL_SCRIPT} ${FILESDIR}/jitsi.sh ${STAGEDIR}${PREFIX}/bin/jitsi
> # Manual page
>-	@${ECHO_CMD} ">> Installing the manual page..."
> 	${INSTALL_MAN} ${FILESDIR}/jitsi.1 ${STAGEDIR}${MANPREFIX}/man/man1
> # Desktop related
>-	@${ECHO_CMD} ">> Installing Jitsi's logo..."
> 	${INSTALL_DATA} ${WRKSRC}/resources/images/logo/sc_logo_128x128.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/jitsi.png
> 
>diff -r -u -N jitsi.bak/distinfo jitsi/distinfo
>--- jitsi.bak/distinfo	2014-01-22 17:30:13.000000000 +0200
>+++ jitsi/distinfo	2015-10-12 13:27:09.559702000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (jitsi-master-084e2b42b5.zip) = e11100ca4c19083002a3d57d3b34711e5601da2c388f4ee89f9b98862d2df01c
>-SIZE (jitsi-master-084e2b42b5.zip) = 68936481
>+SHA256 (jitsi-2.8.5426.zip) = f5d65ce20bb85cf2e04ba27bacf80f1b67245e95218324b9f1f82ba44e9eadaa
>+SIZE (jitsi-2.8.5426.zip) = 67556545
>diff -r -u -N jitsi.bak/files/jitsi.sh jitsi/files/jitsi.sh
>--- jitsi.bak/files/jitsi.sh	2014-01-24 02:14:07.000000000 +0200
>+++ jitsi/files/jitsi.sh	2015-10-11 12:07:06.093848000 +0300
>@@ -8,7 +8,8 @@
> COMMAND="${JAVA} -Dfelix.config.properties=file:${JITSI_LIB}/felix.client.run.properties \
>         -Djava.util.logging.config.file=${JITSI_LIB}/logging.properties \
>         -Djna.library.path=${JITSI_LIB}/native \
>-        -classpath ${JITSI_LIB}/felix.jar:${JITSI_LIB}/jdic-all.jar:${JITSI_BUNDLES}/sc-launcher.jar:${JITSI_BUNDLES}/util.jar \
>+        -classpath ${JITSI_LIB}/felix.jar:${JITSI_BUNDLES}/sc-launcher.jar:${JITSI_BUNDLES}/util.jar:${JITSI_LIB} \
>+        -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=.jitsi \
>         net.java.sip.communicator.launcher.SIPCommunicator"
> 
> export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${JITSI_LIB}/native"
>diff -r -u -N jitsi.bak/pkg-message jitsi/pkg-message
>--- jitsi.bak/pkg-message	2014-04-09 12:01:41.000000000 +0300
>+++ jitsi/pkg-message	2015-10-11 12:07:06.094442000 +0300
>@@ -1,10 +1,9 @@
> From the list of available audio codecs, deselect all except ``opus/48000''.
> From the list of available video codecs, deselect all except ``VP8''.
> 
>-You can make these changes via the interface of Jitsi:
>-
>-  -> Jitsi-Tools-Options-Audio-Encodings
>-  -> Jitsi-Tools-Options-Video-Encodings
>+These changes can be performed from the main menu of Jitsi:
>+ * Tools > Options > Audio > Encodings
>+ * Tools > Options > Video > Encodings
> 
> It is recommended that all the participants of an audio/video call use the
> same codecs.
>diff -r -u -N jitsi.bak/pkg-plist jitsi/pkg-plist
>--- jitsi.bak/pkg-plist	2014-11-22 01:55:49.000000000 +0200
>+++ jitsi/pkg-plist	2015-10-11 12:07:06.094655000 +0300
>@@ -4,17 +4,14 @@
> lib/jitsi/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar
> lib/jitsi/lib/felix.client.run.properties
> lib/jitsi/lib/felix.jar
>-lib/jitsi/lib/jdic-all.jar
> lib/jitsi/lib/logging.properties
> lib/jitsi/lib/native/libhid.so
> lib/jitsi/lib/native/libhwaddressretriever.so
> lib/jitsi/lib/native/libjdic_misc.so
>-lib/jitsi/lib/native/libjnffmpeg.so
> lib/jitsi/lib/native/libjnopus.so
> lib/jitsi/lib/native/libjnpulseaudio.so
> lib/jitsi/lib/native/libjnvideo4linux2.so
>-lib/jitsi/lib/native/libjnvpx.so
>-lib/jitsi/lib/native/libtray.so
>+lib/jitsi/sc-bundles/accountinfo.jar
> lib/jitsi/sc-bundles/addrbook.jar
> lib/jitsi/sc-bundles/advancedconfig.jar
> lib/jitsi/sc-bundles/aimaccregwizz.jar
>@@ -29,7 +26,9 @@
> lib/jitsi/sc-bundles/chatalerter.jar
> lib/jitsi/sc-bundles/chatconfig.jar
> lib/jitsi/sc-bundles/commons-codec.jar
>+lib/jitsi/sc-bundles/commons-lang.jar
> lib/jitsi/sc-bundles/configuration.jar
>+lib/jitsi/sc-bundles/connectioninfo.jar
> lib/jitsi/sc-bundles/contacteventhandler.jar
> lib/jitsi/sc-bundles/contactinfo.jar
> lib/jitsi/sc-bundles/contactlist.jar
>@@ -53,14 +52,20 @@
> lib/jitsi/sc-bundles/googlecontacts-service.jar
> lib/jitsi/sc-bundles/googlecontacts.jar
> lib/jitsi/sc-bundles/googletalkaccregwizz.jar
>+lib/jitsi/sc-bundles/guava.jar
> lib/jitsi/sc-bundles/hid-service.jar
> lib/jitsi/sc-bundles/hid.jar
> lib/jitsi/sc-bundles/history.jar
>+lib/jitsi/sc-bundles/hsqldb.jar
> lib/jitsi/sc-bundles/httpclient.jar
>+lib/jitsi/sc-bundles/httpcore.jar
> lib/jitsi/sc-bundles/httputil.jar
> lib/jitsi/sc-bundles/icqaccregwizz.jar
> lib/jitsi/sc-bundles/ippiaccregwizz.jar
> lib/jitsi/sc-bundles/iptelaccregwizz.jar
>+lib/jitsi/sc-bundles/irc-api-1.0.jar
>+lib/jitsi/sc-bundles/irc-commands.jar
>+lib/jitsi/sc-bundles/ircaccregwizz.jar
> lib/jitsi/sc-bundles/jabberaccregwizz.jar
> lib/jitsi/sc-bundles/jfontchooserlib.jar
> lib/jitsi/sc-bundles/jmdnslib.jar
>@@ -74,7 +79,7 @@
> lib/jitsi/sc-bundles/meta-cl.jar
> lib/jitsi/sc-bundles/metahistory.jar
> lib/jitsi/sc-bundles/msghistory.jar
>-lib/jitsi/sc-bundles/msnaccregwizz.jar
>+lib/jitsi/sc-bundles/muc.jar
> lib/jitsi/sc-bundles/neomedia.jar
> lib/jitsi/sc-bundles/netaddr.jar
> lib/jitsi/sc-bundles/notification-handlers.jar
>@@ -85,6 +90,7 @@
> lib/jitsi/sc-bundles/otr.jar
> lib/jitsi/sc-bundles/packetlogging.jar
> lib/jitsi/sc-bundles/phonenumbercontactsource.jar
>+lib/jitsi/sc-bundles/phonenumbers.jar
> lib/jitsi/sc-bundles/plugin-certconfig.jar
> lib/jitsi/sc-bundles/plugin-contactsourceconfig.jar
> lib/jitsi/sc-bundles/plugin-ldap.jar
>@@ -94,10 +100,10 @@
> lib/jitsi/sc-bundles/pluginmanager.jar
> lib/jitsi/sc-bundles/propertieseditor.jar
> lib/jitsi/sc-bundles/protocol-icq.jar
>+lib/jitsi/sc-bundles/protocol-irc.jar
> lib/jitsi/sc-bundles/protocol-jabber.jar
> lib/jitsi/sc-bundles/protocol-media.jar
> lib/jitsi/sc-bundles/protocol-mock.jar
>-lib/jitsi/sc-bundles/protocol-msn.jar
> lib/jitsi/sc-bundles/protocol-sip.jar
> lib/jitsi/sc-bundles/protocol-yahoo.jar
> lib/jitsi/sc-bundles/protocol.jar
>@@ -127,8 +133,11 @@
> lib/jitsi/sc-bundles/simpleaccreg.jar
> lib/jitsi/sc-bundles/sipaccregwizz.jar
> lib/jitsi/sc-bundles/skinmanager.jar
>+lib/jitsi/sc-bundles/slf4j-api.jar
>+lib/jitsi/sc-bundles/slf4j-jdk14.jar
> lib/jitsi/sc-bundles/smacklib.jar
> lib/jitsi/sc-bundles/spellChecker.jar
>+lib/jitsi/sc-bundles/splash-screen.jar
> lib/jitsi/sc-bundles/swing-ui.jar
> lib/jitsi/sc-bundles/swingnotification.jar
> lib/jitsi/sc-bundles/sysactivitynotifications.jar
>@@ -137,9 +146,12 @@
> lib/jitsi/sc-bundles/ui-service.jar
> lib/jitsi/sc-bundles/update.jar
> lib/jitsi/sc-bundles/updateservice.jar
>+lib/jitsi/sc-bundles/usersearch.jar
> lib/jitsi/sc-bundles/util.jar
> lib/jitsi/sc-bundles/version-impl.jar
> lib/jitsi/sc-bundles/yahooaccregwizz.jar
> lib/jitsi/sc-bundles/zrtp4j.jar
>+libdata/ldconfig/jitsi
> man/man1/jitsi.1.gz
>+share/applications/jitsi.desktop
> share/pixmaps/jitsi.png

Actions: View | Diff

Attachments on bug 203676: 161879 | 161901 | 161937