mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

Fix build on amd64. Add missing dependency on multimedia/mpeg4ip-libmp4v2.

Browse Source 
Submitted by:	peter
Approved by:	maintainer timeout
This commit is contained in:
Kris Kennaway 2004-12-07 05:40:44 +00:00
parent e80b664cd9
commit 0422643c43
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=123360
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
multimedia/mpeg4ip/Makefile
View File

@ -22,7 +22,8 @@ LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \
id3tag.2:${PORTSDIR}/audio/libid3tag \
a52.0:${PORTSDIR}/audio/liba52 \
mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
avcodec.1:${PORTSDIR}/multimedia/ffmpeg
avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
USE_GNOME= \
gtk20 \
@ -98,11 +99,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-player::src::codec::mp3::mp3_file.cpp
USE_GCC= 3.4
.endif
# XXX - temporary fix, not suitable for binaries
.if ${ARCH} == "amd64"
CFLAGS+= -fPIC -DPIC
.endif
###
## Auto detect possible extensions
###

19
multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c
View File

@ -1,20 +1,29 @@
--- lib/sdp/sdp_decode.c.orig Thu Sep 30 01:32:23 2004
+++ lib/sdp/sdp_decode.c Thu Sep 30 01:32:45 2004
--- lib/sdp/sdp_decode.c.orig Tue Feb 24 15:54:20 2004
+++ lib/sdp/sdp_decode.c Mon Nov 22 20:17:07 2004
@@ -378,7 +378,7 @@
q = NULL;
while (p != NULL) {
if (new->adj_time == p->adj_time) {
- sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", p->adj_time);
+ sdp_debug(LOG_NOTICE, "Duplicate time %d in adj description", p->adj_time);
+ sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", (long)p->adj_time);
free(new);
return (start);
}
@@ -1580,7 +1580,7 @@
@@ -1558,6 +1558,7 @@
int valid;
time_adj_desc_t *start_aptr, *aptr;
time_t adj_time;
+ long adj_time_l;
int32_t offset;
int possign;
int err;
@@ -1580,7 +1581,8 @@
continue;
}
// process <adjustment time> - adjust it from NTP to unix time
- sscanf(sep, "%ld", &adj_time);
+ sscanf(sep, "%d", &adj_time);
+ sscanf(sep, "%ld", &adj_time_l);
+ adj_time = adj_time_l;
// Check for negative sign for offset.
ADV_SPACE(lptr);