diff options
| author | arved <arved@FreeBSD.org> | 2003-05-12 22:44:04 +0800 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2003-05-12 22:44:04 +0800 |
| commit | b6387f902434aa4b5ca82ed99c4bd5eef8bd553d (patch) | |
| tree | dd5e95d8ad8bdef5ee36512328765dfc5166f85b | |
| parent | c4fbaeba4cda5544ea95c41cb20b5815d7265837 (diff) | |
| download | freebsd-ports-gnome-b6387f902434aa4b5ca82ed99c4bd5eef8bd553d.tar.gz freebsd-ports-gnome-b6387f902434aa4b5ca82ed99c4bd5eef8bd553d.tar.zst freebsd-ports-gnome-b6387f902434aa4b5ca82ed99c4bd5eef8bd553d.zip | |
Fix a Crash.
Made OGG support optional
Bump PORTREVISION
PR: 51718
Submitted by: maintainer
| -rw-r--r-- | audio/lopster/Makefile | 17 | ||||
| -rw-r--r-- | audio/lopster/files/patch-src::transfer.c | 30 | ||||
| -rw-r--r-- | net-p2p/lopster/Makefile | 17 | ||||
| -rw-r--r-- | net-p2p/lopster/files/patch-src::transfer.c | 30 |
4 files changed, 90 insertions, 4 deletions
diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile index 26a4c45b65c5..2b82dda2e406 100644 --- a/audio/lopster/Makefile +++ b/audio/lopster/Makefile @@ -7,7 +7,7 @@ PORTNAME= lopster PORTVERSION= 1.2.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,7 +25,20 @@ USE_REINPLACE= yes CONFIGURE_ARGS= --with-pthread=yes --with-zlib=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/lib/libogg.so.4) +WITH_LIBOGG= yes +.endif + +.if defined(WITH_LIBOGG) +LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg +.endif + +pre-everything:: + @${ECHO_MSG} "You can specify WITH_LIBOGG to include Ogg support" + post-patch: @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/lopster/files/patch-src::transfer.c b/audio/lopster/files/patch-src::transfer.c new file mode 100644 index 000000000000..86506fc26da9 --- /dev/null +++ b/audio/lopster/files/patch-src::transfer.c @@ -0,0 +1,30 @@ +--- src/transfer.c.orig Tue Mar 4 21:08:57 2003 ++++ src/transfer.c Wed Mar 5 23:23:53 2003 +@@ -5907,6 +5907,7 @@ + GtkCList *clist; + socket_t *socket; + upload_t *upload; ++ share_t *share; + int i1; + + if (!userinfo) return; +@@ -5915,10 +5916,15 @@ + gtk_clist_freeze(clist); + for (i1 = 0; i1 < clist->rows; i1++) { + socket = gtk_clist_get_row_data(clist, i1); +- upload = socket->data; +- if (upload->data->user_info != userinfo) continue; +- +- upload_update(socket); ++ if (socket->type == S_UPLOAD) { ++ upload = socket->data; ++ if (upload->data->user_info != userinfo) continue; ++ upload_update(socket); ++ } else if (socket->type == S_SHARE) { ++ share = socket->data; ++ if (share->data->user_info != userinfo) continue; ++ share_update(socket); ++ } + } + gtk_clist_thaw(clist); + } diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile index 26a4c45b65c5..2b82dda2e406 100644 --- a/net-p2p/lopster/Makefile +++ b/net-p2p/lopster/Makefile @@ -7,7 +7,7 @@ PORTNAME= lopster PORTVERSION= 1.2.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,7 +25,20 @@ USE_REINPLACE= yes CONFIGURE_ARGS= --with-pthread=yes --with-zlib=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/lib/libogg.so.4) +WITH_LIBOGG= yes +.endif + +.if defined(WITH_LIBOGG) +LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg +.endif + +pre-everything:: + @${ECHO_MSG} "You can specify WITH_LIBOGG to include Ogg support" + post-patch: @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net-p2p/lopster/files/patch-src::transfer.c b/net-p2p/lopster/files/patch-src::transfer.c new file mode 100644 index 000000000000..86506fc26da9 --- /dev/null +++ b/net-p2p/lopster/files/patch-src::transfer.c @@ -0,0 +1,30 @@ +--- src/transfer.c.orig Tue Mar 4 21:08:57 2003 ++++ src/transfer.c Wed Mar 5 23:23:53 2003 +@@ -5907,6 +5907,7 @@ + GtkCList *clist; + socket_t *socket; + upload_t *upload; ++ share_t *share; + int i1; + + if (!userinfo) return; +@@ -5915,10 +5916,15 @@ + gtk_clist_freeze(clist); + for (i1 = 0; i1 < clist->rows; i1++) { + socket = gtk_clist_get_row_data(clist, i1); +- upload = socket->data; +- if (upload->data->user_info != userinfo) continue; +- +- upload_update(socket); ++ if (socket->type == S_UPLOAD) { ++ upload = socket->data; ++ if (upload->data->user_info != userinfo) continue; ++ upload_update(socket); ++ } else if (socket->type == S_SHARE) { ++ share = socket->data; ++ if (share->data->user_info != userinfo) continue; ++ share_update(socket); ++ } + } + gtk_clist_thaw(clist); + } |