GNOME.org
 

[girl] girl version 9.9.9

commit b85c8d0b5b5859cc90852ef589c30fb48e8a1b27
Author: Ole Aamot <oka oka no>
Date:   Thu May 4 14:36:26 2017 +0200

    girl version 9.9.9

 NEWS                       |   10 +
 configure.ac               |   16 +-
 girl.spec.in               |    6 +-
 src/GIRL-GUI.c             |  511 ----------------------------
 src/GIRL-GUI.h             |   18 -
 src/GIRL-LISTENER.h        |   62 ----
 src/GIRL-PLAYER-KB.h       |   35 --
 src/GIRL-PLAYER-RENDERER.h |   49 ---
 src/GIRL-PLAYER-RESOURCE.h |    7 -
 src/GIRL-PLAYER.c          |  809 --------------------------------------------
 src/GIRL-PLAYER.h          |   54 ---
 src/GIRL-PROGRAM.h         |   76 ----
 src/GIRL-RUNNERS.h         |   54 ---
 src/GIRL-STATION.c         |  645 -----------------------------------
 src/GIRL-STATION.h         |   88 -----
 src/GIRL-STATIONS-MAP.h    |  110 ------
 src/GIRL-STREAMS.h         |   71 ----
 src/GIRL-TZ.c              |  512 ----------------------------
 src/GIRL-TZ.h              |  118 -------
 src/Makefile.am            |   55 +---
 src/girl.xml               |   20 +-
 21 files changed, 34 insertions(+), 3292 deletions(-)
---
diff --git a/NEWS b/NEWS
index 5a21e17..4887128 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
 =============
+Version 9.9.9
+=============
+
+       * GNOME3: Update info on new gnome-internet-radio-locator repository
+       * configure.ac: Bump version and gnome-internet-radio-locator switch
+       * src/Makefile.am: Remove obsolete build targets
+       * src/girl.xml: Add Radio Free Brooklyn broadcasting in Joint Stereo
+       * src/girl.xml: Add WFUV broadcasting in Joint Stereo
+
+=============
 Version 9.9.8
 =============
 
diff --git a/configure.ac b/configure.ac
index 17064fe..98545cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(girl,9.9.8)
+AC_INIT(girl,9.9.9)
 AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/girl.c])
@@ -75,20 +75,6 @@ PKG_CHECK_MODULES(GIRL,
 
 GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, gobject-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0, 
gstreamer-1.0 gstreamer-video-1.0"
 
-PKG_CHECK_MODULES(GNOME_INTERNET_RADIO_LOCATOR,
-                 gtk+-3.0 >= 3.0 \
-                 glib-2.0 >= 2.38.0 \
-                 gobject-2.0 >= 2.38.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
-                 libxml-2.0 >= 2.0 \
-                 gstreamer-tag-1.0 >= 1.0 \
-                 gstreamer-1.0 >= 1.0 \
-                 gstreamer-player-1.0 >= 1.0 \
-                 gstreamer-video-1.0)
-
-GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS="gtk+-3.0 glib-2.0 gobject-2.0 pangoft2 champlain-gtk-0.12 libxml-2.0, 
gstreamer-1.0 gstreamer-player-1.0 gstreamer-video-1.0"
-
 GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
 
 # Checks for header files.
diff --git a/girl.spec.in b/girl.spec.in
index 4860e10..cd4db19 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -7,9 +7,6 @@ URL:            http://people.gnome.org/~ole/girl
 Group:          Applications/Internet
 Source:         http://people.gnome.org/~ole/%{name}/%{name}-%{version}.tar.xz
 
-BuildRequires:  gtk3-devel
-BuildRequires:  pango
-BuildRequires:  libchamplain-gtk
 BuildRequires:  gtk2-devel
 BuildRequires:  libgnome-devel
 BuildRequires:  libxml2-devel
@@ -74,6 +71,9 @@ fi
 %{_datadir}/help/*/%{name}
 
 %changelog
+* Thu May 04 2017 Ole Aamot - 9.9.9-1.fc25
+- GIRL 9.9.9 build on Fedora Linux 25
+
 * Thu Apr 27 2017 Ole Aamot - 9.9.8-1.fc25
 - GIRL 9.9.8 build on Fedora Linux 25
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 144762e..2c513da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,26 +1,3 @@
-#AM_CPPFLAGS = $(GIRL_CFLAGS) $(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS) \
-1#     $(NULL)
-
-#AM_CFLAGS = $(GIRL_CFLAGS) $(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS) \
-#      -DGIRL_DATADIR="\"$(pkgdatadir)\"" \
-#      $(NULL)
-
-#AM_LDFLAGS= $(GIRL_LIBS) $(GNOME_INTERNET_RADIO_LOCATOR_LIBS) 
-
-noinst_PROGRAMS = test-stations-gfx test-endianess test-stations
-
-test_stations_SOURCES = test-stations.c girl-stations-map.h girl-stations-map.c girl-tz.c girl-tz.h
-test_stations_LDADD = $(GIRL_LIBS) 
-test_stations_CFLAGS = $(GIRL_CFLAGS) -DGIRL_DATADIR="\"$(pkgdatadir)\""
-
-test_stations_gfx_SOURCES = test-stations-gfx.c girl-tz.c girl-tz.h
-test_stations_gfx_LDADD = $(GIRL_LIBS)
-test_stations_gfx_CFLAGS = $(GIRL_CFLAGS) -DGIRL_DATADIR="\"$(pkgdatadir)\""
-
-test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h
-test_endianess_LDADD = $(GIRL_LIBS)
-test_endianess_CFLAGS = $(GIRL_CFLAGS) -DGIRL_DATADIR="\"$(pkgdatadir)\""
-
 bin_PROGRAMS = girl
 
 girl_SOURCES = \
@@ -40,18 +17,6 @@ girl_SOURCES = \
               girl-tz.c \
               girl.c
 
-gnome_internet_radio_locator_SOURCES = \
-              GIRL-GUI.c \
-              GIRL-LISTENER.c \
-               GIRL-PLAYER.c \
-               GIRL-PROGRAM.c \
-              GIRL-RUNNERS.c \
-              GIRL-STATION.c \
-              GIRL-STATIONS-MAP.c \
-              GIRL-STREAMS.c \
-              GIRL-TZ.c \
-              GIRL.c
-
 girl_CFLAGS  = $(GIRL_CFLAGS) \
               -DGIRL_DATADIR=\"$(datadir)/girl\" \
               -DDATADIR=\"$(datadir)\" \
@@ -59,31 +24,13 @@ girl_CFLAGS  = $(GIRL_CFLAGS) \
               -DGIRL_CFG \
               -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
-gnome_internet_radio_locator_CFLAGS  = $(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS) \
-              -DGIRL_DATADIR=\"$(datadir)/girl\" \
-              -DDATADIR=\"$(datadir)\" \
-              -DGIRL_DEBUG=1 \
-              -DGIRL_CFG \
-              -DGNOMELOCALEDIR=\"$(datadir)/locale\"
-
 girl_LDADD = $(GIRL_LIBS)
 
-gnome_internet_radio_locator_LDADD = $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
-
 girldir = $(datadir)/girl
 
 girl_DATA = girl-9.9.dtd girl-logo.png girl.png girl.xml girl.xsl
 
-EXTRA_DIST = GIRL.h GIRL-PLAYER.h GIRL-PLAYER-KB.h GIRL-PLAYER-RESOURCE.h GIRL-STATION.h GIRL-STATIONS-MAP.h 
GIRL-TZ.h GIRL-GUI.h GIRL-LISTENER.h GIRL-PROGRAM.h GIRL-RUNNERS.h GIRL-STREAMS.h girl.h girl-station.h 
girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h girl-player-globals.h 
girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h girl-record-globals.h 
girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.9.dtd girl-map.png girl-logo.png 
girl.png girl.xml girl.xsl
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h 
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h 
girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.9.dtd 
girl-map.png girl-logo.png girl.png girl.xml girl.xsl
 
 LDADD = $(GIRL_LIBS)
 AM_CFLAGS = $(GIRL_CFLAGS) -g
-
-all-local: check-local
-
-check-local: test-stations-gfx test-endianess test-stations
-#      $(builddir)/test-stations-gfx ../data
-#      $(builddir)/test-endianess
-#      $(builddir)/test-stations
-
-noinst_HEADERS = GIRL-PLAYER-RESOURCE.h GIRL-PLAYER-RENDERER.h
diff --git a/src/girl.xml b/src/girl.xml
index 697364f..e5c1481 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="girl.xsl" ?>
 <!DOCTYPE girl SYSTEM "girl-9.9.dtd">
-<girl version="9.9.6">
+<girl version="9.9.9">
+  <station band="90.7FM" id="wfuv" lang="en" name="WFUV" rank="1.0" type="edu">
+    <frequency uri="http://www.wfuv.org/";>Bronx, New York City, NY</frequency>
+    <location>Bronx, New York City, NY</location>
+    <description lang="en">
+      WFUV (90.7 FM, wfuv.org), New York’s source for music discovery, has been a noncommercial, 
member-supported public media service of Fordham University for more than 65 years. WFUV has received 
national recognition for its unique weekday format of adult album alternative music, award-winning local news 
and sports, and a diverse weekend lineup.
+    </description>
+    <stream mime="audio/mpeg" uri="http://wfuv-onair.streamguys.org/onair-hi"; codec="MPEG ADTS, layer III, 
v1" samplerate="44100 Hz" channels="JntStereo" bitrate="128 kbps" />
+  </station>
+  <station band="ONLINE" id="radiofreebrooklyn" lang="en" name="Radio Free Brooklyn" rank="1.0" type="edu">
+    <frequency uri="https://radiofreebrooklyn.com/";>Brooklyn, New York City, NY</frequency>
+    <location>Brooklyn, New York City, NY</location>
+    <description lang="en">
+      Radio Free Brooklyn is a 501(c)3 nonprofit organization whose mission is to give a global voice to 
local artists, residents, community organizers and other non-profit institutions by providing a 
commercial-free freeform Internet Radio platform.
+
+      We are a non-commercial community freeform Internet radio station, streaming original content by the 
artists and residents of NYC’s most populous borough 24-hours a day, 7 days a week.
+    </description>
+    <stream mime="audio/mpeg" uri="http://192.111.140.6:9300/stream"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="JntStereo" bitrate="192 kbps" />
+  </station>
   <station band="ONLINE" id="3rdrock" lang="en" name="NASA's Third Rock Radio" rank="1.0" type="gov">
     <frequency uri="https://www.nasa.gov/feature/third-rock-radio";>ONLINE</frequency>
     <location>Space</location>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]