[xiph-cvs] cvs commit: libshout/src mp3.c shout.c util.c vorbis.c
Michael Smith
msmith at xiph.org
Sun Jul 13 18:22:34 PDT 2003
On Monday 14 July 2003 02:31, Brendan wrote:
> brendan 03/07/13 12:31:20
>
> Modified: include/shout shout.h.in
> src mp3.c shout.c util.c vorbis.c
> Log:
> Insert annoying LGPL and copyright info into source and include files.
> The convenience libs are GPLed rather than LGPLed. Is this an issue?
Yes, it's an issue. The convenience libs should be changed to LGPL (I had this
on my TODO list, but forgot about it). I talked to Jack about this some time
ago (since he's the primary author of most of those files), he said that was
fine. Care to change the relevent bits?
M
>
> Revision Changes Path
> 1.2 +20 -4 libshout/include/shout/shout.h.in
>
> Index: shout.h.in
> ===================================================================
> RCS file: /usr/local/cvsroot/libshout/include/shout/shout.h.in,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -p -u -r1.1 -r1.2
> --- shout.h.in 11 Jul 2003 00:59:56 -0000 1.1
> +++ shout.h.in 13 Jul 2003 16:31:20 -0000 1.2
> @@ -1,7 +1,23 @@
> /* shout.h
> -**
> -** API for libshout, the streaming library for icecast
> -*/
> + *
> + * API for libshout, the streaming library for icecast
> + *
> + * Copyright (C) 2002-2003 the Icecast team <team at icecast.org>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Library General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Library General Public License for more details.
> + *
> + * You should have received a copy of the GNU Library General Public
> + * License along with this library; if not, write to the Free
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA + */
> #ifndef __LIBSHOUT_SHOUT_H__
> #define __LIBSHOUT_SHOUT_H__
>
> @@ -169,4 +185,4 @@ int shout_metadata_add(shout_metadata_t
>
> #define SHOUT_THREADSAFE @SHOUT_THREADSAFE@
>
> -#endif /* __LIBSHOUT_SHOUT_H__ */
> \ No newline at end of file
> +#endif /* __LIBSHOUT_SHOUT_H__ */
>
>
>
> 1.13 +18 -1 libshout/src/mp3.c
>
> Index: mp3.c
> ===================================================================
> RCS file: /usr/local/cvsroot/libshout/src/mp3.c,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -p -u -r1.12 -r1.13
> --- mp3.c 7 Jul 2003 01:40:07 -0000 1.12
> +++ mp3.c 13 Jul 2003 16:31:20 -0000 1.13
> @@ -1,5 +1,22 @@
> /* -*- c-basic-offset: 8; -*- */
> -/* mp3.c: libshout MP3 format handler */
> +/* mp3.c: libshout MP3 format handler
> + *
> + * Copyright (C) 2002-2003 the Icecast team <team at icecast.org>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Library General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Library General Public License for more details.
> + *
> + * You should have received a copy of the GNU Library General Public
> + * License along with this library; if not, write to the Free
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA + */
>
> #include <stdio.h>
> #include <stdlib.h>
>
>
>
> 1.48 +18 -1 libshout/src/shout.c
>
> Index: shout.c
> ===================================================================
> RCS file: /usr/local/cvsroot/libshout/src/shout.c,v
> retrieving revision 1.47
> retrieving revision 1.48
> diff -u -p -u -r1.47 -r1.48
> --- shout.c 9 Jul 2003 18:10:19 -0000 1.47
> +++ shout.c 13 Jul 2003 16:31:20 -0000 1.48
> @@ -1,5 +1,22 @@
> /* -*- c-basic-offset: 8; -*- */
> -/* shout.c: Implementation of public libshout interface shout.h */
> +/* shout.c: Implementation of public libshout interface shout.h
> + *
> + * Copyright (C) 2002-2003 the Icecast team <team at icecast.org>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Library General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Library General Public License for more details.
> + *
> + * You should have received a copy of the GNU Library General Public
> + * License along with this library; if not, write to the Free
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA + */
>
> #ifdef HAVE_CONFIG_H
> #include <config.h>
>
>
>
> 1.18 +18 -1 libshout/src/util.c
>
> Index: util.c
> ===================================================================
> RCS file: /usr/local/cvsroot/libshout/src/util.c,v
> retrieving revision 1.17
> retrieving revision 1.18
> diff -u -p -u -r1.17 -r1.18
> --- util.c 6 Jul 2003 16:25:44 -0000 1.17
> +++ util.c 13 Jul 2003 16:31:20 -0000 1.18
> @@ -1,4 +1,21 @@
> -/* util.c: libshout utility/portability functions */
> +/* util.c: libshout utility/portability functions
> + *
> + * Copyright (C) 2002-2003 the Icecast team <team at icecast.org>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Library General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Library General Public License for more details.
> + *
> + * You should have received a copy of the GNU Library General Public
> + * License along with this library; if not, write to the Free
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA + */
>
> #ifdef HAVE_CONFIG_H
> #include <config.h>
>
>
>
> 1.10 +18 -1 libshout/src/vorbis.c
>
> Index: vorbis.c
> ===================================================================
> RCS file: /usr/local/cvsroot/libshout/src/vorbis.c,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -p -u -r1.9 -r1.10
> --- vorbis.c 6 Jul 2003 16:25:44 -0000 1.9
> +++ vorbis.c 13 Jul 2003 16:31:20 -0000 1.10
> @@ -1,5 +1,22 @@
> /* -*- c-basic-offset: 8; -*- */
> -/* vorbis.c: Ogg Vorbis data handlers for libshout */
> +/* vorbis.c: Ogg Vorbis data handlers for libshout
> + *
> + * Copyright (C) 2002-2003 the Icecast team <team at icecast.org>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Library General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Library General Public License for more details.
> + *
> + * You should have received a copy of the GNU Library General Public
> + * License along with this library; if not, write to the Free
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA + */
>
> #ifdef HAVE_CONFIG_H
> #include <config.h>
>
>
>
> --- >8 ----
> List archives: http://www.xiph.org/archives/
> Ogg project homepage: http://www.xiph.org/ogg/
> To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
> containing only the word 'unsubscribe' in the body. No subject is needed.
> Unsubscribe messages sent to the list will be ignored/filtered.
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list