Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d0312350d9c024dee4cb6abfd311c2954cc7d6e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d0312350d9c024dee4cb6abfd311c2954cc7d6e8)
  • Date: Wed, 14 Apr 2021 11:06:08 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

video/pipewire/DETAILS | 17 +++++---
video/pipewire/HISTORY | 4 ++
x11-libs/wine/DETAILS | 9 +---
x11-libs/wine/HISTORY | 7 +++
x11-libs/wine/PRE_BUILD | 3 +
x11-libs/wine/patches/dnsapi.diff | 76
++++++++++++++++++++++++++++++++++++++
6 files changed, 103 insertions(+), 13 deletions(-)

New commits:
commit d0312350d9c024dee4cb6abfd311c2954cc7d6e8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pipewire: Fix long description wrap

commit d594f77a99c42766feee73eb9e0044b0f8baa0e1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pipewire 0.3.25

commit c56e2a9c33aecee240e009c608a332dc57f36f55
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wine 6.6 (devel)

diff --git a/video/pipewire/DETAILS b/video/pipewire/DETAILS
index 8c7ed02..2507705 100755
--- a/video/pipewire/DETAILS
+++ b/video/pipewire/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=pipewire
- VERSION=0.3.24
-
SOURCE_HASH=sha512:be1fd3b15aae4fc276dd7e4be385cd58e6e9626d6e0a42b7bc3eb46ba324759c05320547aa857510ecf24b1628b76555222d342350d6406ad4d7b536cb3db497
+ VERSION=0.3.25
+
SOURCE_HASH=sha512:0f84be21bfcd70f25900c53a8ce399c29ce2d4d10f8b56e5103603cf0c80673aab0b16492e55b42985283adf46343cdca01626225db85a2263f06c309f68f2d7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://pipewire.org
@@ -12,9 +12,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS=""
SHORT=""
cat << EOF
-PipeWire is a project that aims to greatly improve handling of audio and
video under Linux. It aims to support the
-usecases currently handled by both PulseAudio and Jack and at the same time
provide same level of powerful handling of
-Video input and output. It also introduces a security model that makes
interacting with audio and video devices from
-containerized releases easy, with supporting Flatpak applications being the
primary goal. Alongside Wayland and
-Flatpak we expect PipeWire to provide a core building block for the future
of Linux application development.
+PipeWire is a project that aims to greatly improve handling of audio and
video
+under Linux. It aims to support the usecases currently handled by both
+PulseAudio and Jack and at the same time provide same level of powerful
handling
+of Video input and output. It also introduces a security model that makes
+interacting with audio and video devices from containerized releases easy,
with
+supporting Flatpak applications being the primary goal. Alongside Wayland and
+Flatpak we expect PipeWire to provide a core building block for the future of
+Linux application development.
EOF
diff --git a/video/pipewire/HISTORY b/video/pipewire/HISTORY
index 8a8e001..f9dc263 100644
--- a/video/pipewire/HISTORY
+++ b/video/pipewire/HISTORY
@@ -1,3 +1,7 @@
+2021-04-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.25
+ fixed long description wrap
+
2021-04-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.24
* DEPENDS: change all flags
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index f578f28..010e0b0 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,6 +1,9 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=wine
case "$WINE_BRANCH" in
+(devel) VERSION=6.6 ;;
+(stable) VERSION=6.0 ;;
+esac; case "$WINE_BRANCH" in
(scm)
VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
@@ -9,12 +12,6 @@ case "$WINE_BRANCH" in
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
;;
- (devel)
- VERSION=6.5
- ;&
- (stable)
- VERSION=6.0
- ;&
(*)
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sign
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 7b1792a..da89ceb 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,10 @@
+2021-04-12 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated to 6.6 (devel)
+ * PRE_BUILD, patches/dnsapi.diff: Fix build against musl
+
+2021-04-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated to 6.0 (stable) / 6.5 (devel)
+
2018-06-02 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: stable version 3.0.1

diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/x11-libs/wine/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/x11-libs/wine/patches/dnsapi.diff
b/x11-libs/wine/patches/dnsapi.diff
new file mode 100644
index 0000000..9f748fd
--- /dev/null
+++ b/x11-libs/wine/patches/dnsapi.diff
@@ -0,0 +1,76 @@
+Upstream-Status: Backport
+
+diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
+index ac52147af01..633169e6d66 100644
+--- a/dlls/dnsapi/libresolv.c
++++ b/dlls/dnsapi/libresolv.c
+@@ -344,6 +344,33 @@ static unsigned int get_record_size( const ns_rr *rr )
+ return size;
+ }
+
++/* based on ns_name_skip from libresolv */
++static int skip_name( const unsigned char **ptr, const unsigned char *end )
++{
++ const unsigned char *cp = *ptr;
++ unsigned int len;
++
++ while (cp < end && (len = *cp++))
++ {
++ switch (len & NS_CMPRSFLGS)
++ {
++ case 0:
++ cp += len;
++ continue;
++ case NS_CMPRSFLGS:
++ cp++;
++ break;
++ default:
++ return -1;
++ }
++ break;
++ }
++
++ if (cp > end) return -1;
++ *ptr = cp;
++ return 0;
++}
++
+ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r,
WORD *dlen )
+ {
+ DNS_STATUS ret = ERROR_SUCCESS;
+@@ -390,7 +417,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr
*rr, DNS_RECORDA *r, WORD
+ r->Data.MINFO.pNameMailbox = dname_from_msg( msg, pos );
+ if (!r->Data.MINFO.pNameMailbox) return ERROR_NOT_ENOUGH_MEMORY;
+
+- if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++ if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+ return DNS_ERROR_BAD_PACKET;
+
+ r->Data.MINFO.pNameErrorsMailbox = dname_from_msg( msg, pos );
+@@ -451,7 +478,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr
*rr, DNS_RECORDA *r, WORD
+ r->Data.SIG.pNameSigner = dname_from_msg( msg, pos );
+ if (!r->Data.SIG.pNameSigner) return ERROR_NOT_ENOUGH_MEMORY;
+
+- if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++ if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+ return DNS_ERROR_BAD_PACKET;
+
+ /* FIXME: byte order? */
+@@ -476,7 +503,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr
*rr, DNS_RECORDA *r, WORD
+ r->Data.SOA.pNamePrimaryServer = dname_from_msg( msg, pos );
+ if (!r->Data.SOA.pNamePrimaryServer) return ERROR_NOT_ENOUGH_MEMORY;
+
+- if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++ if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+ return DNS_ERROR_BAD_PACKET;
+
+ r->Data.SOA.pNameAdministrator = dname_from_msg( msg, pos );
+@@ -486,7 +513,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr
*rr, DNS_RECORDA *r, WORD
+ return ERROR_NOT_ENOUGH_MEMORY;
+ }
+
+- if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++ if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+ return DNS_ERROR_BAD_PACKET;
+
+ r->Data.SOA.dwSerialNo = ntohl( *(const DWORD *)pos ); pos +=
sizeof(DWORD);



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d0312350d9c024dee4cb6abfd311c2954cc7d6e8), Ismael Luceno, 04/14/2021

Archive powered by MHonArc 2.6.24.

Top of Page